iliaa Wed Dec 13 15:45:20 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2filter sapi_apache2.c
/php-src NEWS
Log:
Fixed bug #39816 (apxs2filter ignores httpd.conf & .htaccess php config
settings).
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.136.2.2.2.5&r2=1.136.2.2.2.6&diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.5
php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.6
--- php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.5 Sat Nov 4
13:03:56 2006
+++ php-src/sapi/apache2filter/sapi_apache2.c Wed Dec 13 15:45:20 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.136.2.2.2.5 2006/11/04 13:03:56 bjori Exp $ */
+/* $Id: sapi_apache2.c,v 1.136.2.2.2.6 2006/12/13 15:45:20 iliaa Exp $ */
#include <fcntl.h>
@@ -511,6 +511,7 @@
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....
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.428&r2=1.2027.2.547.2.429&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.428 php-src/NEWS:1.2027.2.547.2.429
--- php-src/NEWS:1.2027.2.547.2.428 Wed Dec 13 00:41:33 2006
+++ php-src/NEWS Wed Dec 13 15:45:20 2006
@@ -50,6 +50,8 @@
- 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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
