summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHartmut Holzgraefe <hholzgra@php.net>2001-06-29 05:27:57 +0000
committerHartmut Holzgraefe <hholzgra@php.net>2001-06-29 05:27:57 +0000
commit7f08918b87f757d93358903c05a72f9b79e0ad9d (patch)
tree4ee98a88cdc2b2d6b1847c99249f772c309412a0
parentbc3482d65f23df7de4ae1dc289a52dbf05d40c90 (diff)
downloadphp-git-7f08918b87f757d93358903c05a72f9b79e0ad9d.tar.gz
suppress sending of cookies if session id already came
from a non-cookie source
-rw-r--r--ext/session/session.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index d373b5a757..81a4eb0a81 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -832,6 +832,7 @@ static void php_session_start(PSLS_D)
zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
lensess + 1, (void **) &ppid) == SUCCESS) {
PPID2SID;
+ send_cookie = 0;
}
if (!PS(id) &&
@@ -841,6 +842,7 @@ static void php_session_start(PSLS_D)
zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
lensess + 1, (void **) &ppid) == SUCCESS) {
PPID2SID;
+ send_cookie = 0;
}
}