From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 18 Feb 2015 14:27:27 +0000 (+0100)
Subject: Fix bug #69033 (Request may get env. variables from previous requests if PHP works... 
X-Git-Tag: php-5.5.23RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08b6fe9ef135798aa16a894e5773f8cd76ab1fec;p=php

Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
---

diff --git a/NEWS b/NEWS
index 5004990d31..bf8323d048 100644
--- a/NEWS
+++ b/NEWS
@@ -98,6 +98,8 @@ PHP                                                                        NEWS
 - Standard:
   . Fixed bug #65272 (flock() out parameter not set correctly in windows).
     (Daniel Lowrey)
+  . Fixed bug #69033 (Request may get env. variables from previous requests
+    if PHP works as FastCGI). (Anatol)
 
 - Streams:
   . Fixed bug which caused call after final close on streams filter. (Bob)
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 48ffb33800..cc22d6f48a 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3433,6 +3433,9 @@ static void php_putenv_destructor(putenv_entry *pe) /* {{{ */
 		unsetenv(pe->key);
 # elif defined(PHP_WIN32)
 		SetEnvironmentVariable(pe->key, NULL);
+# ifndef ZTS
+		_putenv_s(pe->key, "");
+# endif
 # else
 		char **env;