summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2002-04-23 18:10:06 +0000
committerSascha Schumann <sas@php.net>2002-04-23 18:10:06 +0000
commit544a3a93a9a8d91e505dd89a95acf6c53bc8c9cd (patch)
tree73ce46fe6bee72fdf1942f3b6067795cc669b3e0
parentd126bace5f02b88022c0866ad15ff2e87313e586 (diff)
downloadphp-git-544a3a93a9a8d91e505dd89a95acf6c53bc8c9cd.tar.gz
MFH define_sid issue
-rw-r--r--ext/session/session.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index e94ab967aa..9e0993dbf6 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -833,6 +833,7 @@ PHPAPI void php_session_start(TSRMLS_D)
zval **data;
char *p;
int send_cookie = 1;
+ int define_sid = 1;
int module_number = PS(module_number);
int nrand;
int lensess;
@@ -846,7 +847,7 @@ PHPAPI void php_session_start(TSRMLS_D)
/*
- * Cookies are preferred, because initially
+ * Cookies are preferred, because initially
* cookie and get variables will be available.
*/
@@ -859,6 +860,7 @@ PHPAPI void php_session_start(TSRMLS_D)
PPID2SID;
PS(apply_trans_sid) = 0;
send_cookie = 0;
+ define_sid = 0;
}
if (!PS(id) &&
@@ -930,8 +932,7 @@ PHPAPI void php_session_start(TSRMLS_D)
}
- /* define SID always, if the client did not send a cookie */
- if (send_cookie) {
+ if (define_sid) {
smart_str var = {0};
smart_str_appends(&var, PS(session_name));