From ee7ef63c001820775d4867a96601d85dd1fde217 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 7 Jun 2016 16:09:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Route=E7=B1=BB=E7=9A=84after?=
 =?UTF-8?q?=5Fbehavior=E5=92=8Cbefore=5Fbehavior=E8=A1=8C=E4=B8=BA?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Route.php   | 4 ++--
 library/think/Session.php | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/think/Route.php b/library/think/Route.php
index 19467985..c7ef23ff 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -757,7 +757,7 @@ class Route
             || (isset($option['ext']) && false === stripos($option['ext'], $request->ext())) // 伪静态后缀检测
              || (isset($option['domain']) && !in_array($option['domain'], [$_SERVER['HTTP_HOST'], self::$subDomain])) // 域名检测
              || (!empty($option['https']) && !$request->isSsl()) // https检测
-             || (!empty($option['before_behavior']) && false === Hook::exec($option['before_behavior'], $url)) // 行为检测
+             || (!empty($option['before_behavior']) && false === Hook::exec($option['before_behavior'], '', $url)) // 行为检测
              || (!empty($option['callback']) && is_callable($option['callback']) && false === call_user_func($option['callback'])) // 自定义检测
         ) {
             return false;
@@ -810,7 +810,7 @@ class Route
                     if ($option['after_behavior'] instanceof \Closure) {
                         $result = call_user_func_array($option['after_behavior'], [$route]);
                     } else {
-                        $result = Hook::exec($option['after_behavior'], $route);
+                        $result = Hook::exec($option['after_behavior'], '', $route);
                     }
                     // 路由规则重定向
                     if ($result instanceof Response) {
diff --git a/library/think/Session.php b/library/think/Session.php
index 49ecb024..17212b89 100644
--- a/library/think/Session.php
+++ b/library/think/Session.php
@@ -245,11 +245,12 @@ class Session
 
     /**
      * 重新生成session_id
+     * @param bool $delete 是否删除关联会话文件
      * @return void
      */
-    private static function regenerate()
+    private static function regenerate($delete = false)
     {
-        session_regenerate_id();
+        session_regenerate_id($delete);
     }
 
     /**