From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 7 Apr 2006 13:45:23 +0000 (+0000)
Subject: CGI anf FastCGI assume $_SERVER and $_ENV have the same values,
X-Git-Tag: php-5.1.3RC3~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79b3d79a95717eafbfbfde22c94052d906c5dcc0;p=php

CGI anf FastCGI assume $_SERVER and $_ENV have the same values,
so we don't need construct the same arrays twich and may just copy it
---

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 77df4f6263..a7460c8cc4 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -431,6 +431,17 @@ static char *sapi_cgi_read_cookies(TSRMLS_D)
 #if PHP_FASTCGI
 void cgi_php_import_environment_variables(zval *array_ptr TSRMLS_DC)
 {
+	if (PG(http_globals)[TRACK_VARS_ENV] &&
+	    array_ptr != PG(http_globals)[TRACK_VARS_ENV]) {
+	    *array_ptr = *PG(http_globals)[TRACK_VARS_ENV];
+	    zval_copy_ctor(array_ptr);
+	    return;
+	} else if (PG(http_globals)[TRACK_VARS_SERVER] &&
+		array_ptr != PG(http_globals)[TRACK_VARS_SERVER]) {
+	    *array_ptr = *PG(http_globals)[TRACK_VARS_SERVER];
+	    zval_copy_ctor(array_ptr);
+	    return;
+	}
 	if (!FCGX_IsCGI()) {
 		FCGX_Request *request = (FCGX_Request *) SG(server_context);
 		char **env, *p;