clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting last patch (merge from sapi/apache).

Browse Source
This commit is contained in:
Edin Kadribasic 2003-05-09 09:13:01 +00:00
parent d758f2ea0b
commit 4aa1414623
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sapi/apache_hooks/mod_php4.c
View File

@ -634,12 +634,6 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
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;
@ -663,6 +657,11 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
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"
* directive, then decline to handle this request
*/