From: Yasuo Ohgaki <yohgaki@php.net>
Date: Wed, 28 Jan 2015 07:01:10 +0000 (+0900)
Subject: Remove legacy code
X-Git-Tag: PRE_PHP7_REMOVALS~21^2~76^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e71099bc4ef382d08eb10466710e4e44f503f11c;p=php

Remove legacy code
---

diff --git a/ext/session/session.c b/ext/session/session.c
index dd3c24cc0e..e60c5acfcf 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -512,11 +512,8 @@ static void php_session_initialize(void) /* {{{ */
 		}
 	}
 
-	/* Set session ID for compatibility for older/3rd party save handlers */
-	if (!PS(use_strict_mode)) {
-		php_session_reset_id();
-		PS(session_status) = php_session_active;
-	}
+	php_session_reset_id();
+	PS(session_status) = php_session_active;
 
 	/* Read data */
 	php_session_track_init();
@@ -527,11 +524,6 @@ static void php_session_initialize(void) /* {{{ */
 		php_error_docref(NULL, E_NOTICE, "Failed to read session data: %s (path: %s)", PS(mod)->s_name, PS(save_path));
 		*/
 	}
-	/* Set session ID if session read didn't activated session */
-	if (PS(use_strict_mode) && PS(session_status) != php_session_active) {
-		php_session_reset_id();
-		PS(session_status) = php_session_active;
-	}
 	if (PS(session_vars)) {
 		zend_string_release(PS(session_vars));
 		PS(session_vars) = NULL;