diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-12-14 03:36:58 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-12-14 03:36:58 +0000 |
| commit | 9defb1298ef1bdceef69b686a4390b992ff6309b (patch) | |
| tree | d8b099eb67755623ec02cbb913bdf6e522ea1104 /sapi | |
| parent | 41fad0ad778cb07f0f933bd4df18258dee8d894a (diff) | |
| download | php-git-9defb1298ef1bdceef69b686a4390b992ff6309b.tar.gz | |
MFB51: Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php
script is loaded via SSI include). (Ilia)
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |