summaryrefslogtreecommitdiff
path: root/ext/session/session.c
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2016-11-11 12:52:31 +0900
committerJoe Watkins <krakjoe@php.net>2016-11-16 05:08:29 +0000
commit7b29c3fba6678ea84285aa60b2494cc79f388bbb (patch)
tree4777b1dbdb505e79981a4316d18cb826c1c0b83e /ext/session/session.c
parent186ff85588abc609bdd3438386887f70ad5c4f9d (diff)
downloadphp-git-7b29c3fba6678ea84285aa60b2494cc79f388bbb.tar.gz
Revert "Fix Bug #73461"
This reverts commit 0383de14678e4c77e11ebf261530d4c1260825a1.
Diffstat (limited to 'ext/session/session.c')
-rw-r--r--ext/session/session.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index bbc531aa73..5484390c7e 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -106,7 +106,6 @@ static inline void php_rinit_session_globals(void) /* {{{ */
/* TODO: These could be moved to MINIT and removed. These should be initialized by php_rshutdown_session_globals() always when execution is finished. */
PS(id) = NULL;
PS(session_status) = php_session_none;
- PS(in_save_handler) = 0;
PS(mod_data) = NULL;
PS(mod_user_is_open) = 0;
PS(define_sid) = 1;
@@ -2036,7 +2035,7 @@ static PHP_FUNCTION(session_create_id)
}
}
- if (!PS(in_save_handler) && PS(session_status) == php_session_active) {
+ if (PS(session_status) == php_session_active) {
int limit = 3;
while (limit--) {
new_id = PS(mod)->s_create_sid(&PS(mod_data));