Fix merge conflict

1 files changed, 4 insertions, 3 deletions

diff --git a/ext/session/session.c b/ext/session/session.c
index 5e4831c6be..2f2f9f7e46 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1620,9 +1620,7 @@ PHPAPI void php_session_start(void) /* {{{ */
 		PS(id) = NULL;
 	}
 
-	php_session_initialize();
-	php_session_cache_limiter();
-
+	/* GC must be done before reading session data. */
 	if ((PS(mod_data) || PS(mod_user_implemented)) && PS(gc_probability) > 0) {
 		int nrdels = -1;
 
@@ -1636,6 +1634,9 @@ PHPAPI void php_session_start(void) /* {{{ */
 #endif
 		}
 	}
+
+	php_session_initialize(TSRMLS_C);
+	php_session_cache_limiter(TSRMLS_C);
 }
 /* }}} */