cvs: php4 /ext/session session.c
| From: | Zeev Suraski | Date: | Sat, 24 Nov 2001 02:41:58 +0000 |
| Subject: | cvs: php4 /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8299@lists.php.net to get a copy of this message | ||
zeev Fri Nov 23 21:41:58 2001 EDT
Modified files:
/php4/ext/session session.c
Log:
Save entries in $_SESSION even if register_globals is on
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.263 php4/ext/session/session.c:1.264
--- php4/ext/session/session.c:1.263 Fri Nov 23 21:14:45 2001
+++ php4/ext/session/session.c Fri Nov 23 21:41:58 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.263 2001/11/24 02:14:45 zeev Exp $ */
+/* $Id: session.c,v 1.264 2001/11/24 02:41:58 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -566,11 +566,11 @@
ulong num_key;
HashPosition pos;
- if (!PG(register_globals)) {
- if (!PS(http_session_vars)) {
- return;
- }
+ if (!PG(register_globals) && !PS(http_session_vars)) {
+ return;
+ }
+ if (PS(http_session_vars)) {
for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(PS(http_session_vars)), &pos);
zend_hash_get_current_key_ex(Z_ARRVAL_P(PS(http_session_vars)), &variable,
&variable_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING;
zend_hash_move_forward_ex(Z_ARRVAL_P(PS(http_session_vars)),&pos)) {