iliaa Thu Nov 17 16:00:29 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/sapi/apache2handler sapi_apache2.c
/php-src NEWS
Log:
MFH: Resolve Apache 2 regression with sub-request handling on non-linux
systems.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.5&r2=1.57.2.6&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.5
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.6
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.5 Wed Oct 26 11:08:23 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 17 16:00:28 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.5 2005/10/26 15:08:23 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.6 2005/11/17 21:00:28 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -457,6 +457,7 @@
if (strcmp(r->protocol, "INCLUDED")) { \
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
} \
+ apr_pool_cleanup_run(r->pool, (void *)&SG(server_context),
php_server_context_cleanup); \
conf = ap_get_module_config(r->per_dir_config, &php5_module);
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.198&r2=1.2027.2.199&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.198 php-src/NEWS:1.2027.2.199
--- php-src/NEWS:1.2027.2.198 Thu Nov 17 09:38:35 2005
+++ php-src/NEWS Thu Nov 17 16:00:28 2005
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
17 Nov 2005, PHP 5.1 Release Candidate 6
+- Resolve Apache 2 regression with sub-request handling on non-linux systems.
+ (Ilia, Tony)
- Make zend_parse_params handle integers in a non-strict fashion, but emit an
E_NOTICE on non well formed interger values. (Ilia)
- Fixed bug #35249 (compile failure when ext/readline is compiled as shared).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
