* Merge from mapi branch.

This commit is contained in:
Guan Xiying
2021-07-14 09:28:34 +08:00
parent ac8fb7783f
commit 6f2ae70f06
23 changed files with 918 additions and 56 deletions
+3 -3
View File
@@ -851,15 +851,15 @@ class baseRouter
{
if(!defined('SESSION_STARTED'))
{
/* If request header has token, use it as session for authentication. */
$this->sessionID = isset($_SERVER['HTTP_TOKEN']) ? session_id($_SERVER['HTTP_TOKEN']) : session_id();
$sessionName = $this->config->sessionVar;
session_name($sessionName);
session_set_cookie_params(0, $this->config->webRoot, '', $this->config->cookieSecure, true);
if($this->config->customSession) session_save_path($this->getTmpRoot() . 'session');
session_start();
/* If request header has token, use it as session for authentication. */
$this->sessionID = isset($_SERVER['HTTP_TOKEN']) ? session_id($_SERVER['HTTP_TOKEN']) : session_id();
if(isset($_GET[$this->config->sessionVar])) helper::restartSession($_GET[$this->config->sessionVar]);
define('SESSION_STARTED', true);