Fixed Bug #71122 Session GC may not remove obsolete session data

Yasuo Ohgaki · Yasuo Ohgaki · commit 8161230505f2 · 2015-12-15T10:27:28.000+09:00
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -1608,9 +1608,7 @@ PHPAPI void php_session_start(TSRMLS_D) /* {{{ */
 		PS(id) = NULL;
 	}
 
-	php_session_initialize(TSRMLS_C);
-	php_session_cache_limiter(TSRMLS_C);
-
+	/* GC must be done before reading session data. */
 	if ((PS(mod_data) || PS(mod_user_implemented)) && PS(gc_probability) > 0) {
 		int nrdels = -1;
 
@@ -1624,6 +1622,9 @@ PHPAPI void php_session_start(TSRMLS_D) /* {{{ */
 #endif
 		}
 	}
+
+	php_session_initialize(TSRMLS_C);
+	php_session_cache_limiter(TSRMLS_C);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1608,9 +1608,7 @@ PHPAPI void php_session_start(TSRMLS_D) /* {{{ */`
`1608`	`1608`	`PS(id) = NULL;`
`1609`	`1609`	`}`
`1610`	`1610`
`1611`		`- php_session_initialize(TSRMLS_C);`
`1612`		`- php_session_cache_limiter(TSRMLS_C);`
`1613`		`-`
	`1611`	`+ /* GC must be done before reading session data. */`
`1614`	`1612`	`if ((PS(mod_data) \|\| PS(mod_user_implemented)) && PS(gc_probability) > 0) {`
`1615`	`1613`	`int nrdels = -1;`
`1616`	`1614`
`@@ -1624,6 +1622,9 @@ PHPAPI void php_session_start(TSRMLS_D) /* {{{ */`
`1624`	`1622`	`#endif`
`1625`	`1623`	`}`
`1626`	`1624`	`}`
	`1625`	`+`
	`1626`	`+ php_session_initialize(TSRMLS_C);`
	`1627`	`+ php_session_cache_limiter(TSRMLS_C);`
`1627`	`1628`	`}`
`1628`	`1629`	`/* }}} */`
`1629`	`1630`