iliaa Wed Aug 13 21:30:07 2003 EDT
Modified files:
/php-src/ext/session session.c
Log:
Fixed bug #25084 (Make refer check not dependant on register_globals)
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.370 php-src/ext/session/session.c:1.371
--- php-src/ext/session/session.c:1.370 Mon Aug 11 20:55:56 2003
+++ php-src/ext/session/session.c Wed Aug 13 21:30:06 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.370 2003/08/12 00:55:56 iliaa Exp $ */
+/* $Id: session.c,v 1.371 2003/08/14 01:30:06 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1113,8 +1113,8 @@
'<session-name>=<session-id>' to allow URLs of the form
http://yoursite/<session-name>=<session-id>/script.php */
- if (!PS(use_only_cookies) && !PS(id) &&
- zend_hash_find(&EG(symbol_table), "REQUEST_URI",
+ if (!PS(use_only_cookies) && !PS(id) && PG(http_globals)[TRACK_VARS_SERVER] &&
+
zend_hash_find(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), "REQUEST_URI",
sizeof("REQUEST_URI"), (void **) &data) == SUCCESS &&
Z_TYPE_PP(data) == IS_STRING &&
(p = strstr(Z_STRVAL_PP(data), PS(session_name))) &&
@@ -1131,7 +1131,8 @@
if (PS(id) &&
PS(extern_referer_chk)[0] != '\0' &&
- zend_hash_find(&EG(symbol_table), "HTTP_REFERER",
+ PG(http_globals)[TRACK_VARS_SERVER] &&
+
zend_hash_find(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), "HTTP_REFERER",
sizeof("HTTP_REFERER"), (void **) &data) == SUCCESS &&
Z_TYPE_PP(data) == IS_STRING &&
Z_STRLEN_PP(data) != 0 &&
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php