cvs: php4 /sapi/apache_hooks mod_php4.c

edink Fri May 9 05:13:01 2003 EDT Modified files: /php4/sapi/apache_hooks mod_php4.c Log: Reverting last patch (merge from sapi/apache). Index: php4/sapi/apache_hooks/mod_php4.c diff -u php4/sapi/apache_hooks/mod_php4.c:1.10 php4/sapi/apache_hooks/mod_php4.c:1.11 --- php4/sapi/apache_hooks/mod_php4.c:1.10 Thu May 8 05:31:08 2003 +++ php4/sapi/apache_hooks/mod_php4.c Fri May 9 05:13:01 2003 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.10 2003/05/08 09:31:08 edink Exp $ */ +/* $Id: mod_php4.c,v 1.11 2003/05/09 09:13:01 edink Exp $ */ #include "php_apache_http.h" @@ -634,12 +634,6 @@ 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; @@ -661,6 +655,11 @@ /* Make sure file exists */ if (filename == NULL && r->finfo.st_mode == 0) { 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"