From: Sterling Hughes <sterling@php.net>
Date: Wed, 16 May 2001 18:28:18 +0000 (+0000)
Subject: # Revert the SLS_FETCH() ;)
X-Git-Tag: PRE_GRANULAR_GARBAGE_FIX~391
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0492f086e777dee65216cff8af4cc590760ade15;p=php

# Revert the SLS_FETCH() ;)
---

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index f07ac35418..1e79701d0f 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -295,12 +295,9 @@ static void php_apache_request_shutdown(void *dummy)
 
 static int php_apache_sapi_activate(SLS_D)
 {
-	request_rec *r; 
-	SLS_FETCH();
+	request_rec *r = (request_rec *) SG(server_context); 
 	APLS_FETCH();
 
-	r = (request_rec *) SG(server_context);
-
 	/*
 	 * For the Apache module version, this bit of code registers a cleanup
 	 * function that gets triggered when our request pool is destroyed.