com php-src: fix-bug-68571-to-php5.5: sapi/fpm/fpm/fastcgi.c sapi/fpm/fpm/fpm_main.c

Commit: d0a58695d00640eafca49c934204e2c1c675fcba Author: redfoxli <honghu069@163.com> Tue, 9 Dec 2014 19:42:55 +0800 Parents: f86aa349eb068b6865c6d423054afe7f781f979e Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d0a58695d00640eafca49c934204e2c1c675fcba Log: fix-bug-68571-to-php5.5 Changed paths: M sapi/fpm/fpm/fastcgi.c M sapi/fpm/fpm/fpm_main.c Diff: diff --git a/sapi/fpm/fpm/fastcgi.c b/sapi/fpm/fpm/fastcgi.c index d2764a5..bcaef1b 100644 --- a/sapi/fpm/fpm/fastcgi.c +++ b/sapi/fpm/fpm/fastcgi.c @@ -977,6 +977,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; } diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 331342c..adc3f5b 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -672,8 +672,11 @@ void sapi_cgi_log_fastcgi(int level, char *message, size_t len) char *buf = malloc(len + 2); memcpy(buf, message, len); memcpy(buf + len, "\n", sizeof("\n")); - fcgi_write(request, FCGI_STDERR, buf, len+1); + ssize_t ret = fcgi_write(request, FCGI_STDERR, buf, len+1); free(buf); + if (ret <= 0) { + php_handle_aborted_connection(); + } } } /* }}} */