cvs: php4 /ext/session session.c
| From: | Sterling Hughes | Date: | Thu, 18 Oct 2001 09:05:17 +0000 |
| Subject: | cvs: php4 /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7850@lists.php.net to get a copy of this message | ||
sterling Thu Oct 18 05:05:17 2001 EDT
Modified files:
/php4/ext/session session.c
Log:
force use of the session.use_trans_sid setting
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.254 php4/ext/session/session.c:1.255
--- php4/ext/session/session.c:1.254 Thu Oct 11 19:33:45 2001
+++ php4/ext/session/session.c Thu Oct 18 05:05:16 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.254 2001/10/11 23:33:45 ssb Exp $ */
+/* $Id: session.c,v 1.255 2001/10/18 09:05:16 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -835,8 +835,8 @@
Z_TYPE_PP(data) == IS_ARRAY &&
zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
lensess + 1, (void **) &ppid) == SUCCESS) {
- PPID2SID;
- PS(apply_trans_sid) = 0;
+ PPID2SID;
+ PS(apply_trans_sid) = 0;
send_cookie = 0;
}
@@ -891,14 +891,16 @@
efree(PS(id));
PS(id) = NULL;
send_cookie = 1;
- PS(apply_trans_sid) = 1;
+ if (PS(use_trans_sid))
+ PS(apply_trans_sid) = 1;
}
if (!PS(id))
PS(id) = _php_create_id(NULL TSRMLS_CC);
if (!PS(use_cookies) && send_cookie) {
- PS(apply_trans_sid) = 1;
+ if (PS(use_trans_sid))
+ PS(apply_trans_sid) = 1;
send_cookie = 0;
}