[PHP-CVS] cvs: php-src(PHP_4_3) /main network.c

[Wez Furlong]

wez             Wed Oct  8 07:22:47 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/main       network.c 
  Log:
  Don't forget these EOF flags either...
  
  
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.83.2.18 php-src/main/network.c:1.83.2.19
--- php-src/main/network.c:1.83.2.18    Fri Jun 27 12:42:51 2003
+++ php-src/main/network.c      Wed Oct  8 07:22:47 2003
@@ -16,7 +16,7 @@
    | Streams work by Wez Furlong <[EMAIL PROTECTED]>                   |
    +----------------------------------------------------------------------+
  */
-/* $Id: network.c,v 1.83.2.18 2003/06/27 16:42:51 sniper Exp $ */
+/* $Id: network.c,v 1.83.2.19 2003/10/08 11:22:47 wez Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -1013,9 +1013,7 @@
 
                        if (nr_bytes <= 0) {
                                retry = handle_ssl_error(stream, nr_bytes TSRMLS_CC);
-                               if (retry == 0 && !SSL_pending(sock->ssl_handle)) {
-                                       stream->eof = 1;
-                               }
+                               stream->eof = (retry == 0 && 
!SSL_pending(sock->ssl_handle));
                        } else {
                                /* we got the data */
                                break;
@@ -1034,9 +1032,7 @@
 
                nr_bytes = recv(sock->socket, buf, count, 0);
 
-               if (nr_bytes == 0 || (nr_bytes == -1 && php_socket_errno() != 
EWOULDBLOCK)) {
-                       stream->eof = 1;
-               }
+               stream->eof = (nr_bytes == 0 || (nr_bytes == -1 && php_socket_errno() 
!= EWOULDBLOCK));
        }
 
        if (nr_bytes > 0) {

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