From: Yasuo Ohgaki <yohgaki@php.net>
Date: Tue, 15 Dec 2015 01:27:28 +0000 (+0900)
Subject: Fixed Bug #71122 Session GC may not remove obsolete session data
X-Git-Tag: php-7.0.2RC1~17^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8161230505f224449c4d4e3ff1f0c2c7ee2d040c;p=php

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

diff --git a/ext/session/session.c b/ext/session/session.c
index eca1ddb4cc..49749219ab 100644
--- 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);
 }
 /* }}} */