diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-27 22:15:12 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-27 22:15:12 +0800 |
| commit | 9fdf62d64aa08d0c62833ee34e54056baffc2730 (patch) | |
| tree | 283b8913a9c46e185c62d011da26bc2a38a78d47 /sapi/cgi/fastcgi.c | |
| parent | 68f5eb7e71ad3293f11c96ee6d0684466e10a3a7 (diff) | |
| parent | 4f187dd44fb4d2387f2437bfe3b9596882185b27 (diff) | |
| download | php-git-9fdf62d64aa08d0c62833ee34e54056baffc2730.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
sapi/cgi/cgi_main.c
Diffstat (limited to 'sapi/cgi/fastcgi.c')
| -rw-r--r-- | sapi/cgi/fastcgi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c index 3acc666cf1..90123db0fa 100644 --- a/sapi/cgi/fastcgi.c +++ b/sapi/cgi/fastcgi.c @@ -1326,6 +1326,7 @@ int fcgi_flush(fcgi_request *req, int close) if (safe_write(req, req->out_buf, len) != len) { req->keep = 0; + req->out_pos = req->out_buf; return 0; } |