summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--ext/standard/basic_functions.c3
2 files changed, 5 insertions, 0 deletions
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;