Index: trunk/core/kernel/session/session.php =================================================================== diff -u -r2680 -r2681 --- trunk/core/kernel/session/session.php (.../session.php) (revision 2680) +++ trunk/core/kernel/session/session.php (.../session.php) (revision 2681) @@ -247,6 +247,7 @@ { $this->Mode = $mode; $this->CachedNeedQueryString = null; + $this->CachedSID = null; } function SetCookiePath($path) Index: trunk/core/kernel/application.php =================================================================== diff -u -r2679 -r2681 --- trunk/core/kernel/application.php (.../application.php) (revision 2679) +++ trunk/core/kernel/application.php (.../application.php) (revision 2681) @@ -671,9 +671,14 @@ if ($ssl !== null) { $session =& $this->recallObject('Session'); $cookie_url = $session->CookieDomain.$session->CookiePath; - $ssl_url = $this->ConfigValue('SSL_URL'); + if ($ssl) { + $target_url = $this->ConfigValue('SSL_URL'); + } + else { + $target_url = 'http://'.$this->RecallVar('HTTP_SERVER_NAME').$this->RecallVar('HTTP_BASE_PATH'); + } - if (!preg_match('#'.preg_quote($cookie_url).'#', $ssl_url)) { + if (!preg_match('#'.preg_quote($cookie_url).'#', $target_url)) { $session->SetMode(smGET_ONLY); } }