diff options
| author | Edin Kadribasic <edink@php.net> | 2003-05-08 09:31:08 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2003-05-08 09:31:08 +0000 |
| commit | 692b508957b1c93e63e0b92916d999748fa6f061 (patch) | |
| tree | db78a41960a1af1c356938576394d358012489d5 | |
| parent | 6f0e0a61b653865a92e063bedbb9c3a69fdd231f (diff) | |
| download | php-git-692b508957b1c93e63e0b92916d999748fa6f061.tar.gz | |
Merge from sapi/apache (fix for #23504)
| -rw-r--r-- | sapi/apache_hooks/mod_php4.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sapi/apache_hooks/mod_php4.c b/sapi/apache_hooks/mod_php4.c index 6175514310..256712673c 100644 --- 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 */ |