Rebase alignments

Author: jorgsowa

ext/session/php_session.h

@@ -147,9 +147,9 @@ typedef struct _php_ps_globals {
 	zend_long cookie_lifetime;
 	zend_string *cookie_path;
 	zend_string *cookie_domain;
+	zend_string *cookie_samesite;
 	bool  cookie_secure;
 	bool  cookie_httponly;
-	zend_string *cookie_samesite;
 	const ps_module *mod;
 	const ps_module *default_mod;
 	void *mod_data;
@@ -198,7 +198,7 @@ typedef struct _php_ps_globals {
 	bool rfc1867_enabled; /* session.upload_progress.enabled */
 	bool rfc1867_cleanup; /* session.upload_progress.cleanup */
 
-	bool use_strict_mode; /* whether or not PHP accepts unknown session ids */
+	bool use_strict_mode; /* whether PHP accepts unknown session ids */
 	bool lazy_write; /* omit session write when it is possible */
 	bool in_save_handler; /* state if session is in save handler or not */
 	bool set_handler;     /* state if session module i setting handler or not */

ext/session/session.c

@@ -969,7 +969,7 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_BOOLEAN("session.use_cookies",      "1",         PHP_INI_ALL, OnUpdateSessionBool,   use_cookies,        php_ps_globals,    ps_globals)
 	STD_PHP_INI_BOOLEAN("session.use_only_cookies", "1",         PHP_INI_ALL, OnUpdateUseOnlyCookies,   use_only_cookies,   php_ps_globals,    ps_globals)
 	STD_PHP_INI_BOOLEAN("session.use_strict_mode",  "0",         PHP_INI_ALL, OnUpdateSessionBool,   use_strict_mode,    php_ps_globals,    ps_globals)
-	STD_PHP_INI_ENTRY("session.referer_check",      "",          PHP_INI_ALL, OnUpdateSessionStr,    extern_referer_chk, php_ps_globals,    ps_globals)
+	STD_PHP_INI_ENTRY("session.referer_check",      "",          PHP_INI_ALL, OnUpdateRefererCheck,    extern_referer_chk, php_ps_globals,    ps_globals)
 	STD_PHP_INI_ENTRY("session.cache_limiter",      "nocache",   PHP_INI_ALL, OnUpdateSessionStr,    cache_limiter,      php_ps_globals,    ps_globals)
 	STD_PHP_INI_ENTRY("session.cache_expire",       "180",       PHP_INI_ALL, OnUpdateSessionLong,   cache_expire,       php_ps_globals,    ps_globals)
 	STD_PHP_INI_BOOLEAN("session.use_trans_sid",    "0",         PHP_INI_ALL, OnUpdateUseTransSid,   use_trans_sid,      php_ps_globals,    ps_globals)
@@ -1652,7 +1652,7 @@ PHPAPI zend_result php_session_start(void) /* {{{ */
 {
 	zval *ppid;
 	zval *data;
-	char *p, *value;
+	char *value;
 
 	switch (PS(session_status)) {
 		case php_session_active:
@@ -1718,21 +1718,6 @@ PHPAPI zend_result php_session_start(void) /* {{{ */
 					ppid2sid(ppid);
 				}
 			}
-			/* Check the REQUEST_URI symbol for a string of the form
-			 * '<session-name>=<session-id>' to allow URLs of the form
-			 * http://yoursite/<session-name>=<session-id>/script.php */
-			if (!PS(id) && zend_is_auto_global(ZSTR_KNOWN(ZEND_STR_AUTOGLOBAL_SERVER)) == SUCCESS &&
-				(data = zend_hash_str_find(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]), "REQUEST_URI", sizeof("REQUEST_URI") - 1)) &&
-				Z_TYPE_P(data) == IS_STRING &&
-				(p = strstr(Z_STRVAL_P(data), ZSTR_VAL(PS(session_name)))) &&
-				p[ZSTR_LEN(PS(session_name))] == '='
-				) {
-				char *q;
-				p += ZSTR_LEN(PS(session_name));
-				if ((q = strpbrk(p, "/?\\"))) {
-					PS(id) = zend_string_init(p, q - p, 0);
-				}
-			}
 			/* Check whether the current request was referred to by
 			 * an external site which invalidates the previously found id. */
 			if (PS(id) && PS(extern_referer_chk) && ZSTR_LEN(PS(extern_referer_chk)) != 0 &&

ext/session/tests/session_name_variation1.phpt

@@ -15,12 +15,6 @@ ob_start();
 
 echo "*** Testing session_name() : variation ***\n";
 
-var_dump(session_name("\0"));
-var_dump(session_start());
-var_dump(session_name());
-var_dump(session_destroy());
-var_dump(session_name());
-
 var_dump(session_name("15"));
 var_dump(session_start());
 var_dump(session_name());
@@ -51,13 +45,6 @@ ob_end_flush();
 --EXPECTF--
 *** Testing session_name() : variation ***
 
-Warning: session_name(): session.name "" cannot contain NUL bytes in %s on line %d
-string(9) "PHPSESSID"
-bool(true)
-string(9) "PHPSESSID"
-bool(true)
-string(9) "PHPSESSID"
-
 Warning: session_name(): session.name "15" cannot be numeric in %s on line %d
 string(9) "PHPSESSID"
 bool(true)