diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-12-14 03:36:44 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-12-14 03:36:44 +0000 |
| commit | 00b9392bf5fc116cfc3f6108805ca918180fcba2 (patch) | |
| tree | fa33a6ffb2a7c385eefd019d31adaeecbbaed709 | |
| parent | b041abbb4e3d4772f84c61dea019a3bf2744ddbc (diff) | |
| download | php-git-00b9392bf5fc116cfc3f6108805ca918180fcba2.tar.gz | |
Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php
script is loaded via SSI include).
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -34,6 +34,8 @@ PHP NEWS - Fixed bug #35612 (iis6 Access Violation crash). (Dmitry, alacn.uhahaa) - 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 #35570 (segfault when re-using soap client object). (Dmitry) - Fixed bug #35558 (mktime() interpreting 3 digit years incorrectly). (Ilia) - Fixed bug #35543 (php crash when calling non existing method of a class diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 354e2b9c60..0a9ab08ac8 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -471,7 +471,7 @@ static int php_handler(request_rec *r) /* 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) |