sas             Mon Sep 23 10:04:51 2002 EDT

  Modified files:              
    /php4/ext/session   session.c 
  Log:
  (php_get_session_var) Always return FAILURE if no data source was found.
  
  Noticed by: Sebastian Bergmann
  
  
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.314 php4/ext/session/session.c:1.315
--- php4/ext/session/session.c:1.314    Sat Sep 21 01:46:32 2002
+++ php4/ext/session/session.c  Mon Sep 23 10:04:50 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: session.c,v 1.314 2002/09/21 05:46:32 sas Exp $ */
+/* $Id: session.c,v 1.315 2002/09/23 14:04:50 sas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -287,10 +287,10 @@
                if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen+1, 
(void **) state_var)==SUCCESS) {
                        return SUCCESS;
                }
-       } else if (!PG(register_globals)) {
-               /* register_globals is disabled, but we don't have http_session_vars */
-               return FAILURE;
-       }       
+       }
+       
+       /* register_globals is disabled, but we don't have http_session_vars */
+       return FAILURE;
 }
 
 #define PS_BIN_NR_OF_BITS 8



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

Reply via email to