MFH: Fixed possible INI setting leak via virtual() in Apache 2 sapi.

diff --git a/NEWS b/NEWS
index 3e88b080f6d97cb62d5283c6e501a0527f52d056..5872304d2eadc999e6fa8b0d19af3474d8cefda7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2005, Version 4.4.1
+- Fixed possible INI setting leak via virtual() in Apache 2 sapi. (Ilia)
 - Fixed possible crash and/or memory corruption in import_request_variables().
   (Ilia)
 - Fixed potential GLOBALS overwrite via import_request_variables(). (Ilia)

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 78d4fdfa9b82159780d51cadd75eff97c81754cf..44b25b200d23b998f1dfc7a4d1c48460ed28e456 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -453,6 +453,11 @@ static int php_handler(request_rec *r)
        request_rec *parent_req = NULL;
        TSRMLS_FETCH();
 
+#define PHPAP_INI_OFF \
+       if (strcmp(r->protocol, "INCLUDED")) { \
+               zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
+       } \
+
        conf = ap_get_module_config(r->per_dir_config, &php4_module);
 
        /* apply_config() needs r in some cases, so allocate server_context early */
@@ -474,9 +479,7 @@ static int php_handler(request_rec *r)
        if (strcmp(r->handler, PHP_MAGIC_TYPE) && strcmp(r->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(r->handler, PHP_SCRIPT)) {
                /* Check for xbithack in this case. */
                if (!AP2(xbithack) || strcmp(r->handler, "text/html") || !(r->finfo.protection & APR_UEXECUTE)) {
-                       zend_try {
-                               zend_ini_deactivate(TSRMLS_C);
-                       } zend_end_try();
+                       PHPAP_INI_OFF;
                        return DECLINED;
                }
        }
@@ -485,32 +488,24 @@ static int php_handler(request_rec *r)
         * the configuration; default behaviour is to accept. */ 
        if (r->used_path_info == AP_REQ_REJECT_PATH_INFO
                && r->path_info && r->path_info[0]) {
-               zend_try {
-                       zend_ini_deactivate(TSRMLS_C);
-               } zend_end_try();
+               PHPAP_INI_OFF;
                return HTTP_NOT_FOUND;
        }
 
        /* handle situations where user turns the engine off */
        if (!AP2(engine)) {
-               zend_try {
-                       zend_ini_deactivate(TSRMLS_C);
-               } zend_end_try();
+               PHPAP_INI_OFF;
                return DECLINED;
        }
 
        if (r->finfo.filetype == 0) {
                php_apache_sapi_log_message_ex("script '%s' not found or unable to stat", r);
-               zend_try {
-                               zend_ini_deactivate(TSRMLS_C);
-               } zend_end_try();
+               PHPAP_INI_OFF;
                return HTTP_NOT_FOUND;
        }
        if (r->finfo.filetype == APR_DIR) {
                php_apache_sapi_log_message_ex("attempt to invoke directory '%s' as script", r);
-               zend_try {
-                       zend_ini_deactivate(TSRMLS_C);
-               } zend_end_try();
+               PHPAP_INI_OFF;
                return HTTP_FORBIDDEN;
        }