From 923881a661c99636eab2a9d7ead7b96eed159b82 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 22 Mar 2016 10:53:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BPUT=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0GET=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/App.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/think/App.php b/library/think/App.php
index 924412a0..a0c58056 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -130,6 +130,7 @@ class App
                     break;
                 case 'PUT':
                     parse_str(file_get_contents('php://input'), $vars);
+                    $vars = array_merge($_GET, $vars);
                     break;
                 default:
                     $vars = $_GET;