Merge branch 'PHP-7.0'

* PHP-7.0: Fixed bug #72308 (fastcgi_finish_request and logging environment variables)
Sannis · Jun 2, 2016 · 0ed4034 · 0ed4034
2 parents 1b4946e + 31ce3a6
commit 0ed4034
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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;
 	}