From: Xinchen Hui <laruence@php.net>
Date: Sat, 29 Oct 2011 02:14:04 +0000 (+0000)
Subject: Fixed bug #60146 (Last 2 lines of page not being output)
X-Git-Tag: php-5.4.0RC1~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=091f279eb025a91d82f0ca0f0f8e31571175bf69;p=php

Fixed bug #60146 (Last 2 lines of page not being output)
---

diff --git a/NEWS b/NEWS
index e09214eb4b..8b0c17a02e 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ PHP                                                                        NEWS
   . Fixed bug #60112 (If URI does not contain a file, index.php is not served).
     (Laruence)
   . Fixed bug #60115 (memory definitely lost in cli server). (Laruence)
+  . Fixed bug #60146 (Last 2 lines of page not being output). (Laruence)
 
 - Core:
   . Fixed bug #60120 (proc_open's streams may hang with stdin/out/err when 
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 8b4303c360..046c622e55 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1579,7 +1579,7 @@ static size_t php_cli_server_client_send_through(php_cli_server_client *client,
 		ssize_t nbytes_sent = send(client->sock, str + str_len - nbytes_left, nbytes_left, 0);
 		if (nbytes_sent < 0) {
 			int err = php_socket_errno();
-			if (err == EAGAIN) {
+			if (err == SOCK_EAGAIN) {
 				int nfds = php_pollfd_for(client->sock, POLLOUT, &tv);
 				if (nfds > 0) {
 					continue;