cvs: php-src(PHP_5_1) / NEWS /sapi/apache2handler sapi_apache2.c

iliaa Wed Aug 17 21:14:46 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/sapi/apache2handler sapi_apache2.c /php-src NEWS Log: MFH: Fixed bug #33987 (php script as ErrorDocument causes crash in Apache 2). http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57&r2=1.57.2.1&ty=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57 php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.1 --- php-src/sapi/apache2handler/sapi_apache2.c:1.57 Wed Aug 3 10:08:48 2005 +++ php-src/sapi/apache2handler/sapi_apache2.c Wed Aug 17 21:14:41 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.57 2005/08/03 14:08:48 sniper Exp $ */ +/* $Id: sapi_apache2.c,v 1.57.2.1 2005/08/18 01:14:41 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -458,6 +458,7 @@ /* 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 @@ } } 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; } http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.19&r2=1.2027.2.20&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.19 php-src/NEWS:1.2027.2.20 --- php-src/NEWS:1.2027.2.19 Wed Aug 17 12:56:20 2005 +++ php-src/NEWS Wed Aug 17 21:14:42 2005 @@ -27,6 +27,8 @@ - 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).