Index: sapi/apache2handler/sapi_apache2.c
===================================================================
RCS file: /repository/php-src/sapi/apache2handler/sapi_apache2.c,v
retrieving revision 1.57.2.3
diff -u -p -d -r1.57.2.3 sapi_apache2.c
--- sapi/apache2handler/sapi_apache2.c	5 Oct 2005 00:43:38 -0000	1.57.2.3
+++ sapi/apache2handler/sapi_apache2.c	12 Oct 2005 17:07:30 -0000
@@ -473,6 +473,7 @@ normal:
 		ctx->r = r;
 		ctx = NULL; /* May look weird to null it here, but it is to catch the right case in the first_try later on */
 	} else {
+		parent_req = ctx->r;
 		ctx->r = r;
 	}
 	apply_config(conf);
@@ -531,7 +532,15 @@ zend_first_try {
 			zend_bailout();
 		}
 	} else {
-		parent_req = ctx->r;
+		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 (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
+				zend_bailout();
+			}
+		}
+		
 		/* check if comming due to ErrorDocument */
 		if (parent_req && parent_req->status != HTTP_OK) {
 			parent_req = NULL;