Fix merge conflict

Yasuo Ohgaki · Yasuo Ohgaki · commit 1e042ae4a78f · 2015-12-15T10:30:16.000+09:00
diff --git 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);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1620,9 +1620,7 @@ PHPAPI void php_session_start(void) /* {{{ */`
`1620`	`1620`	`PS(id) = NULL;`
`1621`	`1621`	`}`
`1622`	`1622`
`1623`		`- php_session_initialize();`
`1624`		`- php_session_cache_limiter();`
`1625`		`-`
	`1623`	`+ /* GC must be done before reading session data. */`
`1626`	`1624`	`if ((PS(mod_data) \|\| PS(mod_user_implemented)) && PS(gc_probability) > 0) {`
`1627`	`1625`	`int nrdels = -1;`
`1628`	`1626`
`@@ -1636,6 +1634,9 @@ PHPAPI void php_session_start(void) /* {{{ */`
`1636`	`1634`	`#endif`
`1637`	`1635`	`}`
`1638`	`1636`	`}`
	`1637`	`+`
	`1638`	`+ php_session_initialize(TSRMLS_C);`
	`1639`	`+ php_session_cache_limiter(TSRMLS_C);`
`1639`	`1640`	`}`
`1640`	`1641`	`/* }}} */`
`1641`	`1642`