cvs: php4(PHP_4_2_0) /ext/session session.c
| From: | Sascha Schumann | Date: | Tue, 23 Apr 2002 18:10:09 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11348@lists.php.net to get a copy of this message | ||
sas Tue Apr 23 14:10:09 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/session session.c
Log:
MFH define_sid issue
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.292 php4/ext/session/session.c:1.292.2.1
--- php4/ext/session/session.c:1.292 Wed Mar 6 07:34:47 2002
+++ php4/ext/session/session.c Tue Apr 23 14:10:06 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.292 2002/03/06 12:34:47 sas Exp $ */
+/* $Id: session.c,v 1.292.2.1 2002/04/23 18:10:06 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -833,6 +833,7 @@
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 @@
/*
- * Cookies are preferred, because initially
+ * Cookies are preferred, because initially
* cookie and get variables will be available.
*/
@@ -859,6 +860,7 @@
PPID2SID;
PS(apply_trans_sid) = 0;
send_cookie = 0;
+ define_sid = 0;
}
if (!PS(id) &&
@@ -930,8 +932,7 @@
}
- /* 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));