[PHP-CVS] cvs: php4 /main network.c

[Wez Furlong]

wez             Fri Oct 18 13:14:32 2002 EDT

  Modified files:              
    /php4/main  network.c 
  Log:
  Revert my last bogus commit.
  Change the comparison to something that is less likely to inspire me to
  make the same mistake again...
  
  
Index: php4/main/network.c
diff -u php4/main/network.c:1.79 php4/main/network.c:1.80
--- php4/main/network.c:1.79    Fri Oct 18 08:15:04 2002
+++ php4/main/network.c Fri Oct 18 13:14:32 2002
@@ -16,7 +16,7 @@
    | Streams work by Wez Furlong <[EMAIL PROTECTED]>                   |
    +----------------------------------------------------------------------+
  */
-/* $Id: network.c,v 1.79 2002/10/18 12:15:04 wez Exp $ */
+/* $Id: network.c,v 1.80 2002/10/18 17:14:32 wez Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -940,7 +940,7 @@
 
                nr_bytes = recv(sock->socket, buf, count, 0);
 
-               if (nr_bytes == 0 || (nr_bytes < count && php_socket_errno() != 
EWOULDBLOCK)) {
+               if (nr_bytes == 0 || (nr_bytes == -1 && php_socket_errno() != 
+EWOULDBLOCK)) {
                        stream->eof = 1;
                }
        }



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