diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-06-02 14:16:32 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-06-02 14:16:32 +0800 |
| commit | 31ce3a661a04ec8addd8b0ede4af2d336646d0ec (patch) | |
| tree | 283639ff6dafab0003561f3bc25bd9f2312e08a1 | |
| parent | 51cb58e7092afe794b56e575e3c18ae23d7905ee (diff) | |
| download | php-git-31ce3a661a04ec8addd8b0ede4af2d336646d0ec.tar.gz | |
Fixed bug #72308 (fastcgi_finish_request and logging environment variables)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | main/fastcgi.c | 7 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -7,6 +7,10 @@ PHP NEWS . Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes). (Esminis at esminis dot lt) +- FPM: + . Fixed bug #72308 (fastcgi_finish_request and logging environment + variables). (Laruence) + - Intl: . Fixed bug #64524 (Add intl.use_exceptions to php.ini-*). (Anatol) 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) { diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 940d6c788d..5adeb63b7a 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1538,7 +1538,7 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */ php_header(); fcgi_flush(request, 1); - fcgi_close(request, 0, 1); + fcgi_close(request, 0, 0); RETURN_TRUE; } |