From: Ben Mansell <joosters@php.net>
Date: Fri, 4 May 2001 09:49:14 +0000 (+0000)
Subject: Removed a duplicate php_import_environment_variables() call
X-Git-Tag: php-4.0.6RC1~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13e4699ae302c5aeed20ae5feba7bdd5b2941092;p=php

Removed a duplicate php_import_environment_variables() call
from fastcgi sapi
---

diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
index 92b0e36c2a..cc96a6d7f0 100644
--- a/sapi/fastcgi/fastcgi.c
+++ b/sapi/fastcgi/fastcgi.c
@@ -126,10 +126,13 @@ static void sapi_fastcgi_register_variables(zval *track_vars_array ELS_DC SLS_DC
 	char *self = getenv("REQUEST_URI");
 	char *ptr = strchr( self, '?' );
 
-	/* In CGI mode, we consider the environment to be a part of the server
-	 * variables
-	 */
-	php_import_environment_variables(track_vars_array ELS_CC PLS_CC);
+	/*
+         * note that the environment will already have been set up
+         * via fastcgi_module_main(), below.
+         *
+         * fastcgi_module_main() -> php_request_startup() ->
+         * php_hash_environment() -> php_import_environment_variables()
+         */
 
 	/* strip query string off this */
 	if ( ptr ) *ptr = 0;