mirror of
https://github.com/php/php-src.git
synced 2025-08-19 17:04:47 +02:00
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:
parent
41fad0ad77
commit
9defb1298e
1 changed files with 1 additions and 1 deletions
|
@ -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)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue