From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 26 Oct 2005 15:08:23 +0000 (+0000)
Subject: Additional tweaks to the patch for bug #34249.
X-Git-Tag: php-5.1.0RC4~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51d8950b53a8ade2548238a0c9b23bcca7f183c9;p=php

Additional tweaks to the patch for bug #34249.
---

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 06b7bd912c..c2952c4255 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -535,7 +535,10 @@ zend_first_try {
 		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();
 			}