]> granicus.if.org Git - php/commitdiff
Remove legacy code
authorYasuo Ohgaki <yohgaki@php.net>
Wed, 28 Jan 2015 07:01:10 +0000 (16:01 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Wed, 28 Jan 2015 07:01:10 +0000 (16:01 +0900)
ext/session/session.c

index dd3c24cc0eb42a8d0c8796b26346ccfd274fe090..e60c5acfcf88456cd43839b8aac6e24755df6e23 100644 (file)
@@ -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;