From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 2 Nov 2005 17:55:17 +0000 (+0000)
Subject: Fixed bug #35059 (Apache2 crash with mod_rewrite).
X-Git-Tag: php-4.4.2RC1~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=098854c59be09a47c274d69b560dd238146779cb;p=php

Fixed bug #35059 (Apache2 crash with mod_rewrite).
---

diff --git a/NEWS b/NEWS
index 0f9d205a03..628f1f757e 100644
--- 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 fa5e0371ce..19f655273e 100644
--- 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();
 			}