summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorEdin Kadribasic <edink@php.net>2003-05-09 09:11:14 +0000
committerEdin Kadribasic <edink@php.net>2003-05-09 09:11:14 +0000
commitd758f2ea0b73c9b62171a2becaa4811e110833c8 (patch)
tree975cb739e60da125cac37f3b065fb872b1dd792c /sapi
parent16ade3dd460cf70a0f2b742ce36991d4f216dc85 (diff)
downloadphp-git-d758f2ea0b73c9b62171a2becaa4811e110833c8.tar.gz
Reverting my last patch because user reports it does not help
solve the problem. (bug #23504)
Diffstat (limited to 'sapi')
-rw-r--r--sapi/apache/mod_php5.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 5565db62a9..6a32db9e07 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -534,11 +534,6 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
HashTable *per_dir_conf;
TSRMLS_FETCH();
- per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php5_module);
- if (per_dir_conf) {
- zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
- }
-
if (AP(in_request)) {
zend_file_handle fh;
@@ -562,6 +557,11 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
return DECLINED;
}
+ per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php5_module);
+ if (per_dir_conf) {
+ zend_hash_apply((HashTable *) per_dir_conf, (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
*/