Merge from sapi/apache (fix for #23504)

diff --git a/sapi/apache_hooks/mod_php4.c b/sapi/apache_hooks/mod_php4.c
index 6175514310804fbf140b01eddffe92f4e3dd275e..256712673cc67b375840fea9e421854e11bdc242 100644 (file)
--- a/sapi/apache_hooks/mod_php4.c
+++ b/sapi/apache_hooks/mod_php4.c
@@ -634,6 +634,12 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
        int retval;
        php_per_dir_config *per_dir_conf;
        TSRMLS_FETCH();
+
+       per_dir_conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+       if (per_dir_conf) {
+               zend_hash_apply((HashTable *) per_dir_conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
+       }
+
        if (AP(in_request)) {
                zend_file_handle fh;
 
@@ -657,11 +663,6 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
                        return DECLINED;
                }
 
-               per_dir_conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
-               if (per_dir_conf) {
-                       zend_hash_apply((HashTable *) per_dir_conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
-               }
-
                /* If PHP parser engine has been turned off with an "engine off"
                 * directive, then decline to handle this request
                 */