MFH: bug #28324

diff --git a/NEWS b/NEWS
index ea2f82cc35edbcbeb307d5537f940ed684483dd6..7a02d2cbc16209c3ab51dda75a58c80b39f255a1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -106,6 +106,8 @@ PHP                                                                        NEWS
   entries). (Andrei)
 - Fixed bug #28444 (Cannot access undefined property for object with overloaded
   property access). (Dmitry)
+- Fixed bug #28324 (HTTP_SESSION_VARS appear when register_long_arrays is 
+  Off). (Tony)
 - Fixed bug #28227 (PHP CGI depends upon non-standard SCRIPT_FILENAME). 
   (lukem at NetBSD dot org)
 - Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).

diff --git a/ext/session/session.c b/ext/session/session.c
index 72788d4e47f8b4e0e972bf994b23ab4f8b0d27d6..599a2c05714c89158140065d8c8230f00cc747ca 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -536,7 +536,9 @@ static void php_session_track_init(TSRMLS_D)
        array_init(session_vars);
        PS(http_session_vars) = session_vars;
 
-       ZEND_SET_GLOBAL_VAR_WITH_LENGTH("HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), PS(http_session_vars), 2, 1);
+       if (PG(register_long_arrays)) {
+               ZEND_SET_GLOBAL_VAR_WITH_LENGTH("HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), PS(http_session_vars), 2, 1);
+       }
        ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"), PS(http_session_vars), 2, 1);
 }