iliaa Wed Dec 14 03:38:55 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/sapi/apache2handler sapi_apache2.c
/php-src NEWS
Log:
MFH: Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php
script is loaded via SSI include).
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.40.2.8&r2=1.1.2.40.2.9&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.8
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.9
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.8 Fri Nov 18
19:03:13 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Wed Dec 14 03:38:55 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.40.2.8 2005/11/18 19:03:13 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.40.2.9 2005/12/14 03:38:55 iliaa Exp $ */
#include <fcntl.h>
@@ -471,7 +471,7 @@
/* apply_config() needs r in some cases, so allocate server_context
early */
ctx = SG(server_context);
- if (ctx == NULL) {
+ if (ctx == NULL || (ctx && ctx->request_processed &&
!strcmp(r->protocol, "INCLUDED"))) {
ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
/* register a cleanup so we clear out the SG(server_context)
* after each request. Note: We pass in the pointer to the
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1247.2.920.2.100&r2=1.1247.2.920.2.101&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.100 php-src/NEWS:1.1247.2.920.2.101
--- php-src/NEWS:1.1247.2.920.2.100 Tue Dec 13 21:45:00 2005
+++ php-src/NEWS Wed Dec 14 03:38:55 2005
@@ -8,6 +8,8 @@
(vovik at getart dot ru, Tony)
- Fixed bug #35594 (Multiple calls to getopt() may result in a crash).
(rabbitt at gmail dot com, Ilia)
+- Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php
+ script is loaded via SSI include). (Ilia)
- Fixed bug #35536 (mysql_field_type() doesn't handle NEWDECIMAL). (Tony)
- Fixed bug #35410 (wddx_deserialize() doesn't handle large ints as keys
properly). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
