MFB51: Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php

script is loaded via SSI include). (Ilia)
This commit is contained in:
Ilia Alshanetsky 2005-12-14 03:36:58 +00:00
parent 41fad0ad77
commit 9defb1298e

View file

@ -471,7 +471,7 @@ static int php_handler(request_rec *r)
/* apply_config() needs r in some cases, so allocate server_context early */ /* apply_config() needs r in some cases, so allocate server_context early */
ctx = SG(server_context); ctx = SG(server_context);
if (ctx == NULL) { if (ctx == NULL || (ctx && ctx->request_processed && !strcmp(r->protocol, "INCLUDED"))) {
normal: normal:
ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx)); ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
/* register a cleanup so we clear out the SG(server_context) /* register a cleanup so we clear out the SG(server_context)