iliaa           Wed Aug 13 21:32:02 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/session        session.c 
    /php-src    NEWS 
  Log:
  MFH: 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.336.2.21 
php-src/ext/session/session.c:1.336.2.22
--- php-src/ext/session/session.c:1.336.2.21    Mon Aug 11 15:21:22 2003
+++ php-src/ext/session/session.c       Wed Aug 13 21:32:01 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: session.c,v 1.336.2.21 2003/08/11 19:21:22 iliaa Exp $ */
+/* $Id: session.c,v 1.336.2.22 2003/08/14 01:32:01 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1014,8 +1014,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))) &&
@@ -1032,7 +1032,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 &&
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.346 php-src/NEWS:1.1247.2.347
--- php-src/NEWS:1.1247.2.346   Wed Aug 13 14:16:00 2003
+++ php-src/NEWS        Wed Aug 13 21:32:02 2003
@@ -1,6 +1,7 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Aug 2003, Version 4.3.3RC4
+- Fixed bug #25084 (Make refer check not dependant on register_globals). (Ilia)
 - Fixed bug #25044 (header("Location:") changing HTTP status). (Marcus)
 - Fixed bug #25037 (Possible infinite loop inside SendText()). (Ilia)
 - Fixed bug #25007 (rand() & mt_rand() seed RNG every call). (Jani)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to