summaryrefslogtreecommitdiff
path: root/ext/session
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2007-08-05 13:10:32 +0000
committerJani Taskinen <jani@php.net>2007-08-05 13:10:32 +0000
commit5735862a92d8c49f08fd85d98715eaeb7585377b (patch)
treec5d21727d49d763348b2e3f18bb93c15a592612f /ext/session
parent878a90e66a7f83dcafa8994e937119b383dffef1 (diff)
downloadphp-git-5735862a92d8c49f08fd85d98715eaeb7585377b.tar.gz
MFB (since Ilia is too lazy..): Fix bug #42135
Diffstat (limited to 'ext/session')
-rw-r--r--ext/session/session.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index dfa798e06b..38c69e0864 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1212,10 +1212,7 @@ PHPAPI void php_session_start(TSRMLS_D)
PS(apply_trans_sid) = PS(use_trans_sid);
- PS(define_sid) = 1;
- PS(send_cookie) = 1;
if (PS(session_status) != php_session_none) {
-
if (PS(session_status) == php_session_disabled) {
char *value;
@@ -1231,6 +1228,9 @@ PHPAPI void php_session_start(TSRMLS_D)
php_error(E_NOTICE, "A session had already been started - ignoring session_start()");
return;
+ } else {
+ PS(define_sid) = 1;
+ PS(send_cookie) = 1;
}
lensess = strlen(PS(session_name));