MFB51: Additional tweaks to the patch for bug #34249.

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 06b7bd912cd48c282430147688cd0633521f2937..c2952c4255b31b306dfa0423382ccefb9f11765a 100644 (file)
--- 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();
                        }