Merge branch 'develop' into pr/utf8mb4

Conflicts:
	tests/Install/AutoinstallCept.php
This commit is contained in:
Kijin Sung 2016-01-11 20:03:55 +09:00
commit e572b81b8a
42 changed files with 77 additions and 6133 deletions

View file

@ -366,13 +366,14 @@ class Context
$session_id = $_COOKIE[$session_name];
}
if($session_id !== NULL || $this->db_info->cache_friendly != 'Y')
if($session_id !== NULL || $this->db_info->delay_session != 'Y')
{
$this->setCacheControl(0, false);
session_start();
}
else
{
ob_start();
$this->setCacheControl(-1, true);
register_shutdown_function(array($this, 'checkSessionStatus'));
$_SESSION = array();