From eb8bab9f466ffe950898e1310afc825f2dac83ad Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Wed, 13 Dec 2006 15:45:20 +0000 Subject: [PATCH] Fixed bug #39816 (apxs2filter ignores httpd.conf & .htaccess php config settings). --- NEWS | 2 ++ sapi/apache2filter/sapi_apache2.c | 1 + 2 files changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 7e805cfeb0..91ce7c5440 100644 --- 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 059f9941e5..0ba545f6ef 100644 --- 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.... -- 2.40.0