summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2016-01-29 20:38:59 -0800
committerXinchen Hui <laruence@gmail.com>2016-01-29 20:38:59 -0800
commitf6d8af73ad971d1c46eafb2318c27d2129a39a16 (patch)
tree44aceff04c2220c0ffdd4aa28299e3b0cc66fa48
parent31aaa14e7163ab17dc832e1864c5244499b10776 (diff)
parent3dadd654cf675dfb04bc21b0db64f4cb46d1879c (diff)
downloadphp-git-f6d8af73ad971d1c46eafb2318c27d2129a39a16.tar.gz
Merge branch 'PHP-7.0'
-rw-r--r--main/fastcgi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/fastcgi.c b/main/fastcgi.c
index 3ab08b625f..ce33369045 100644
--- a/main/fastcgi.c
+++ b/main/fastcgi.c
@@ -1277,11 +1277,11 @@ void fcgi_close(fcgi_request *req, int force, int destroy)
DisconnectNamedPipe(pipe);
} else {
if (!force) {
- fcgi_header buf;
+ char buf[8];
shutdown(req->fd, 1);
- /* read the last FCGI_STDIN header (it may be omitted) */
- recv(req->fd, (char *)(&buf), sizeof(buf), 0);
+ /* read any remaining data, it may be omitted */
+ while (recv(req->fd, buf, sizeof(buf), 0) > 0) {}
}
closesocket(req->fd);
}