diff options
author | Yasuo Ohgaki <yohgaki@php.net> | 2015-01-28 16:01:10 +0900 |
---|---|---|
committer | Yasuo Ohgaki <yohgaki@php.net> | 2015-01-28 16:01:10 +0900 |
commit | e71099bc4ef382d08eb10466710e4e44f503f11c (patch) | |
tree | f9263d00b9a5c28910adedefbb3dac10c5e4d100 | |
parent | 4d747b13567f5e178daebc79ddc99e5a2143fd1e (diff) | |
download | php-git-e71099bc4ef382d08eb10466710e4e44f503f11c.tar.gz |
Remove legacy code
-rw-r--r-- | ext/session/session.c | 12 |
1 files changed, 2 insertions, 10 deletions
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; |