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

Ilia Alshanetsky · Ilia Alshanetsky · commit eb8bab9f466f · 2006-12-13T15:45:20.000Z
settings).
diff --git 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
@@ -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....

Original file line number	Diff line number	Diff line change
`@@ -511,6 +511,7 @@ static int php_output_filter(ap_filter_t f, apr_bucket_brigade bb)`
`511`	`511`	`return ap_pass_brigade(f->next, bb);`
`512`	`512`	`}`
`513`	`513`
	`514`	`+ apply_config(conf);`
`514`	`515`	`php_apache_request_ctor(f, ctx TSRMLS_CC);`
`515`	`516`
`516`	`517`	`// It'd be nice if we could highlight based of a zend_file_handle here....`