laruence                                 Sat, 29 Oct 2011 02:14:04 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=318540

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

Bug: https://bugs.php.net/60146 (Feedback) Last 2 lines of page not being output
      
Changed paths:
    U   php/php-src/branches/PHP_5_4/NEWS
    U   php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
    U   php/php-src/trunk/sapi/cli/php_cli_server.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS   2011-10-28 22:28:37 UTC (rev 318539)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-10-29 02:14:04 UTC (rev 318540)
@@ -8,6 +8,7 @@
   . 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

Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c      2011-10-28 
22:28:37 UTC (rev 318539)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c      2011-10-29 
02:14:04 UTC (rev 318540)
@@ -1579,7 +1579,7 @@
                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;

Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-10-28 22:28:37 UTC (rev 
318539)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-10-29 02:14:04 UTC (rev 
318540)
@@ -1579,7 +1579,7 @@
                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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to