From 439d05fa6f243278ea3316f8c9c14c4cc7be11a3 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 27 Jun 2017 17:56:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=B8=8D=E5=8C=BA=E5=88=86=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/Request.php b/library/think/Request.php
index e3fa3a4f..f5bab0bb 100644
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -1542,7 +1542,7 @@ class Request
                 $key = call_user_func_array($key, [$this]);
             } elseif (true === $key) {
                 foreach ($except as $rule) {
-                    if (0 === strpos($this->url(), $rule)) {
+                    if (0 === stripos($this->url(), $rule)) {
                         return;
                     }
                 }

From fb1124a91d94bab613b0e7197df05884e0bd3719 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 28 Jun 2017 13:36:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B9=E8=BF=9BConnection=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Connection.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/think/db/Connection.php b/library/think/db/Connection.php
index fa773e51..2c2b9a8c 100644
--- a/library/think/db/Connection.php
+++ b/library/think/db/Connection.php
@@ -386,7 +386,7 @@ abstract class Connection
                 return $this->close()->query($sql, $bind, $master, $pdo);
             }
             throw new PDOException($e, $this->config, $this->getLastsql());
-        } catch (\ErrorException $e) {
+        } catch (\Exception $e) {
             if ($this->isBreak($e)) {
                 return $this->close()->query($sql, $bind, $master, $pdo);
             }
@@ -449,7 +449,7 @@ abstract class Connection
                 return $this->close()->execute($sql, $bind);
             }
             throw new PDOException($e, $this->config, $this->getLastsql());
-        } catch (\ErrorException $e) {
+        } catch (\Exception $e) {
             if ($this->isBreak($e)) {
                 return $this->close()->execute($sql, $bind);
             }