]> granicus.if.org Git - php/commitdiff
Reverting my last patch because user reports it does not help
authorEdin Kadribasic <edink@php.net>
Fri, 9 May 2003 09:11:14 +0000 (09:11 +0000)
committerEdin Kadribasic <edink@php.net>
Fri, 9 May 2003 09:11:14 +0000 (09:11 +0000)
solve the problem. (bug #23504)

sapi/apache/mod_php5.c

index 5565db62a95e94d5201dd7c4913d5e5ca7d576bb..6a32db9e07fa28c15d2713af708bed643aab615a 100644 (file)
@@ -534,11 +534,6 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
        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 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
                        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
                 */