summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2016-06-02 14:16:32 +0800
committerXinchen Hui <laruence@gmail.com>2016-06-02 14:16:32 +0800
commit31ce3a661a04ec8addd8b0ede4af2d336646d0ec (patch)
tree283639ff6dafab0003561f3bc25bd9f2312e08a1 /main
parent51cb58e7092afe794b56e575e3c18ae23d7905ee (diff)
downloadphp-git-31ce3a661a04ec8addd8b0ede4af2d336646d0ec.tar.gz
Fixed bug #72308 (fastcgi_finish_request and logging environment variables)
Diffstat (limited to 'main')
-rw-r--r--main/fastcgi.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/main/fastcgi.c b/main/fastcgi.c
index fbc6f403a0..8fc7d6a968 100644
--- a/main/fastcgi.c
+++ b/main/fastcgi.c
@@ -1049,7 +1049,12 @@ static int fcgi_read_request(fcgi_request *req)
req->in_len = 0;
req->out_hdr = NULL;
req->out_pos = req->out_buf;
- req->has_env = 1;
+
+ if (req->has_env) {
+ fcgi_hash_clean(&req->env);
+ } else {
+ req->has_env = 1;
+ }
if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
hdr.version < FCGI_VERSION_1) {