fix-bug-68571-to-php5.5

redfoxli · redfoxli · commit d0a58695d006 · 2014-12-09T19:42:55.000+08:00
diff --git 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
@@ -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();
+	        }
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -977,6 +977,7 @@ int fcgi_flush(fcgi_request *req, int close)`
`977`	`977`
`978`	`978`	`if (safe_write(req, req->out_buf, len) != len) {`
`979`	`979`	`req->keep = 0;`
	`980`	`+ req->out_pos = req->out_buf;`
`980`	`981`	`return 0;`
`981`	`982`	`}`
`982`	`983`
Original file line number	Diff line number	Diff line change
`@@ -672,8 +672,11 @@ void sapi_cgi_log_fastcgi(int level, char *message, size_t len)`
`672`	`672`	`char *buf = malloc(len + 2);`
`673`	`673`	`memcpy(buf, message, len);`
`674`	`674`	`memcpy(buf + len, "\n", sizeof("\n"));`
`675`		`- fcgi_write(request, FCGI_STDERR, buf, len+1);`
	`675`	`+ ssize_t ret = fcgi_write(request, FCGI_STDERR, buf, len+1);`
`676`	`676`	`free(buf);`
	`677`	`+ if (ret <= 0) {`
	`678`	`+ php_handle_aborted_connection();`
	`679`	`+ }`
`677`	`680`	`}`
`678`	`681`	`}`
`679`	`682`	`/* }}} */`