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

diff --git a/NEWS b/NEWS
index e09214eb4b48b2aab25e17e29bc54e6810ef4643..8b0c17a02e412b5e4960f8023d289d34fa9fe8ed 100644 (file)
--- 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 8b4303c360e86646e82dcdb3c56b1e4de0132b59..046c622e55455322c7abf0afeacd88d778286c2c 100644 (file)
--- 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;