浏览代码

ZF-11460: regenerate session IDs when requested

- Applied patch from Adam L.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24195 44c647ce-9c0f-0410-b52a-842ac1e357ba
matthew 14 年之前
父节点
当前提交
26b4d2cc7f
共有 1 个文件被更改,包括 3 次插入14 次删除
  1. 3 14
      library/Zend/Session.php

+ 3 - 14
library/Zend/Session.php

@@ -308,24 +308,13 @@ class Zend_Session extends Zend_Session_Abstract
                 "() before any output has been sent to the browser; output started in {$filename}/{$linenum}");
         }
 
-        if (self::$_sessionStarted && self::$_regenerateIdState <= 0) {
+        if ( !self::$_sessionStarted ) {
+            self::$_regenerateIdState = -1;
+        } else {
             if (!self::$_unitTestEnabled) {
                 session_regenerate_id(true);
             }
             self::$_regenerateIdState = 1;
-        } else {
-            /**
-             * @todo If we can detect that this requester had no session previously,
-             *       then why regenerate the id before the session has started?
-             *       Feedback wanted for:
-             //
-            if (isset($_COOKIE[session_name()]) || (!use only cookies && isset($_REQUEST[session_name()]))) {
-                self::$_regenerateIdState = 1;
-            } else {
-                self::$_regenerateIdState = -1;
-            }
-            //*/
-            self::$_regenerateIdState = -1;
         }
     }