From 4aa1414623ec342acee2e78ab3c0055b50f66016 Mon Sep 17 00:00:00 2001 From: Edin Kadribasic Date: Fri, 9 May 2003 09:13:01 +0000 Subject: [PATCH] Reverting last patch (merge from sapi/apache). --- sapi/apache_hooks/mod_php4.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sapi/apache_hooks/mod_php4.c b/sapi/apache_hooks/mod_php4.c index 256712673c..6175514310 100644 --- a/sapi/apache_hooks/mod_php4.c +++ b/sapi/apache_hooks/mod_php4.c @@ -634,12 +634,6 @@ 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; @@ -663,6 +657,11 @@ 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 */ -- 2.40.0