Fixed bug #35059 (Apache2 crash with mod_rewrite).

diff --git a/NEWS b/NEWS
index 0f9d205a035526c7ac19f2cd00330d9dece08cfc..628f1f757e6f8f45110ad398f22bbbf12314b153 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2006, Version 4.4.2
 - Missing safe_mode/open_basedir check in cURL extension. (Ilia)
+- Fixed bug #35059 (Apache2 crash with mod_rewrite). (Ilia)
 - Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is 
   zero). (Tony)
 - Fixed bug #33760 (cURL needs to implement CRYPTO_callback functions to prevent

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index fa5e0371cec2099679b28992841159d6443e012a..19f655273ea98453b77601d0c76f31cf9ec54ba0 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -535,7 +535,7 @@ normal:
                if (!parent_req) {
                        parent_req = ctx->r;
                }
-               if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
+               if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
                        if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
                                zend_bailout();
                        }