iliaa Fri Nov 18 13:59:51 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/sapi/apache2handler sapi_apache2.c
Log:
Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.202&r2=1.2027.2.203&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.202 php-src/NEWS:1.2027.2.203
--- php-src/NEWS:1.2027.2.202 Fri Nov 18 06:00:14 2005
+++ php-src/NEWS Fri Nov 18 13:59:46 2005
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Nov 2005, PHP 5.1
+- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
17 Nov 2005, PHP 5.1 Release Candidate 6
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.6&r2=1.57.2.7&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.6
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.7
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.6 Thu Nov 17 16:00:28 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Nov 18 13:59:49 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.6 2005/11/17 21:00:28 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.7 2005/11/18 18:59:49 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -443,6 +443,18 @@
php_request_shutdown(NULL);
}
+static void php_apache_ini_dtor(request_rec *r, request_rec *p TSRMLS_DC)
+{
+ if (strcmp(r->protocol, "INCLUDED")) {
+ zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try();
+ }
+ if (p) {
+ ((php_struct *)SG(server_context))->r = p;
+ } else {
+ apr_pool_cleanup_run(r->pool, (void *)&SG(server_context),
php_server_context_cleanup);
+ }
+}
+
static int php_handler(request_rec *r)
{
php_struct *ctx;
@@ -453,11 +465,7 @@
request_rec *parent_req = NULL;
TSRMLS_FETCH();
-#define PHPAP_INI_OFF \
- 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); \
+#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);
conf = ap_get_module_config(r->per_dir_config, &php5_module);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
