iliaa Wed Dec 14 03:36:58 2005 EDT
Modified files:
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFB51: Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php
script is loaded via SSI include). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.64&r2=1.65&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.64
php-src/sapi/apache2handler/sapi_apache2.c:1.65
--- php-src/sapi/apache2handler/sapi_apache2.c:1.64 Fri Nov 18 19:01:50 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Wed Dec 14 03:36:58 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.64 2005/11/18 19:01:50 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.65 2005/12/14 03:36:58 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -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"))) {
normal:
ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
/* register a cleanup so we clear out the SG(server_context)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
