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); } /**