diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-12-13 15:45:20 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-12-13 15:45:20 +0000 |
| commit | eb8bab9f466ffe950898e1310afc825f2dac83ad (patch) | |
| tree | af373950605206156998b1cbb90e6815e51f7500 | |
| parent | 563221783a9879813202fc3d43a69deb8bc2037d (diff) | |
| download | php-git-eb8bab9f466ffe950898e1310afc825f2dac83ad.tar.gz | |
Fixed bug #39816 (apxs2filter ignores httpd.conf & .htaccess php config
settings).
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -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.... |