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

edink Fri May 9 05:08:09 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/apache mod_php4.c Log: Reverting my last patch because user reports it does not help solve the problem. (bug #23504) # I cannot reproduce this myself so reverting the patch # is probably the best thing to do at this point. Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.146.2.7 php4/sapi/apache/mod_php4.c:1.146.2.8 --- php4/sapi/apache/mod_php4.c:1.146.2.7 Thu May 8 05:19:44 2003 +++ php4/sapi/apache/mod_php4.c Fri May 9 05:08:09 2003 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.146.2.7 2003/05/08 09:19:44 edink Exp $ */ +/* $Id: mod_php4.c,v 1.146.2.8 2003/05/09 09:08:09 edink Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -533,11 +533,6 @@ 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; @@ -561,6 +556,11 @@ 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 */