Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5

Author: laruence

sapi/fpm/fpm/fastcgi.c

@@ -975,6 +975,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;
 	}
 

sapi/fpm/fpm/fpm_main.c

@@ -670,10 +670,14 @@ void sapi_cgi_log_fastcgi(int level, char *message, size_t len)
 	 */
 	if (CGIG(fcgi_logging) && request && message && len > 0) {
 		char *buf = malloc(len + 2);
+		ssize_t ret = 0;
 		memcpy(buf, message, len);
 		memcpy(buf + len, "\n", sizeof("\n"));
-		fcgi_write(request, FCGI_STDERR, buf, len+1);
+		ret = fcgi_write(request, FCGI_STDERR, buf, len+1);
 		free(buf);
+	        if (ret <= 0) {
+                    php_handle_aborted_connection();
+	        }
 	}
 }
 /* }}} */