clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFH: Fixed bug #33987 (php script as ErrorDocument causes crash in Apache 2).

Browse Source
This commit is contained in:
Ilia Alshanetsky 2005-08-18 01:14:42 +00:00
parent 94c7fd0603
commit e134382a71
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -27,6 +27,8 @@ PHP NEWS
- Fixed bug #33996 (No information given for fatal error on passing invalid
value to typed argument). (Dmitry)
- Fixed bug #33989 (extract($GLOBALS,EXTR_REFS) crashes PHP). (Dmitry)
- Fixed bug #33987 (php script as ErrorDocument causes crash in Apache 2).
(Ilia)
- Fixed bug #33967 (misuse of Exception constructor doesn't display errorfile).
(Jani)
- Fixed bug #33958 (duplicate cookies and magic_quotes=off may cause a crash).

6
sapi/apache2handler/sapi_apache2.c
View File

@ -458,6 +458,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) {
normal:
ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
/* register a cleanup so we clear out the SG(server_context)
* after each request. Note: We pass in the pointer to the
@ -536,6 +537,11 @@ zend_first_try {
}
} else {
parent_req = ctx->r;
/* check if comming due to ErrorDocument */
if (parent_req != HTTP_OK) {
parent_req = NULL;
goto normal;
}
ctx->r = r;
brigade = ctx->brigade;
}