cvs: php4 /sapi/apache mod_php5.c

edink Fri May 9 05:11:14 2003 EDT Modified files: /php4/sapi/apache mod_php5.c Log: Reverting my last patch because user reports it does not help solve the problem. (bug #23504) Index: php4/sapi/apache/mod_php5.c diff -u php4/sapi/apache/mod_php5.c:1.3 php4/sapi/apache/mod_php5.c:1.4 --- php4/sapi/apache/mod_php5.c:1.3 Thu May 8 10:42:31 2003 +++ php4/sapi/apache/mod_php5.c Fri May 9 05:11:14 2003 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php5.c,v 1.3 2003/05/08 14:42:31 edink Exp $ */ +/* $Id: mod_php5.c,v 1.4 2003/05/09 09:11:14 edink Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -534,11 +534,6 @@ 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 @@ 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 */