From: Zeev Suraski <zeev@php.net>
Date: Tue, 15 May 2001 14:55:42 +0000 (+0000)
Subject: Move the initialization to a safer place (earlier, it could end up
X-Git-Tag: PRE_GRANULAR_GARBAGE_FIX~407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1845fb13815bdb0ceb6b51bfbd75ed75faa8b53;p=php

Move the initialization to a safer place (earlier, it could end up
not being reset to 0 under certain circumstances)
---

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index cfff789b20..f89d015713 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -307,6 +307,7 @@ static int php_apache_sapi_activate(SLS_D)
 	 */
 	block_alarms();
 	register_cleanup(((request_rec *) SG(server_context))->pool, NULL, php_apache_request_shutdown, php_request_shutdown_for_exec);
+	AP(in_request)=1;
 	unblock_alarms();
 
 	/* Override the default headers_only value - sometimes "GET" requests should actually only
@@ -458,7 +459,6 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
 		zend_execute_scripts(ZEND_INCLUDE CLS_CC ELS_CC, 1, &fh);
 		return OK;
 	}
-	AP(in_request)=1;
 
 	if (setjmp(EG(bailout))!=0) {
 		return OK;