Fixed bug #39816 (apxs2filter ignores httpd.conf & .htaccess php config

settings).

diff --git a/NEWS b/NEWS
index 7e805cfeb02d2dd42b9463bddd89bb85c1a22e1b..91ce7c54405cddf73fe3b058543ff13a3adb1976 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -50,6 +50,8 @@ PHP                                                                        NEWS
 - Fixed FastCGI impersonation for persistent connections on Windows. (Dmitry)
 - Fixed wrong signature initialization in imagepng (Takeshi Abe)
 - Added optimization for imageline with horizontal and vertial lines (Pierre)
+- Fixed bug #39816 (apxs2filter ignores httpd.conf & .htaccess php config
+  settings). (Ilia)
 - Fixed bug #39797 (virtual() does not reset changed INI settings). (Ilia)
 - Fixed bug #39795 (build fails on AIX because crypt_r() uses different data 
   struct). (Tony)

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 059f9941e558019a02a71fd4cccbc286974ff1c4..0ba545f6ef7a087b379f28737a24961a0f6474fe 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -511,6 +511,7 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
                return ap_pass_brigade(f->next, bb);
        }
 
+       apply_config(conf);
        php_apache_request_ctor(f, ctx TSRMLS_CC);
        
        // It'd be nice if we could highlight based of a zend_file_handle here....