cvs: php4(PHP_4_3) /sapi/apache mod_php4.c

edink Thu May 8 05:19:44 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/apache mod_php4.c Log: Fix for bug #23504. Read per_dir configuration before trying to open the the php file for execution. Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.146.2.6 php4/sapi/apache/mod_php4.c:1.146.2.7 --- php4/sapi/apache/mod_php4.c:1.146.2.6 Sun Feb 23 20:29:54 2003 +++ php4/sapi/apache/mod_php4.c Thu May 8 05:19:44 2003 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.146.2.6 2003/02/24 01:29:54 gschlossnagle Exp $ */ +/* $Id: mod_php4.c,v 1.146.2.7 2003/05/08 09:19:44 edink Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -533,6 +533,11 @@ HashTable *per_dir_conf; TSRMLS_FETCH(); + per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_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; @@ -556,11 +561,6 @@ return DECLINED; } - per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_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 */