* modules/access/*: grrr... apparently I also need to reset the file descriptor set...

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 937243c9ee17af35770fd55f43c4f3b3dbf54ff8..22e79f908e90844a126d9b5d47fe3b7d726c53f8 100644 (file)
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -2,7 +2,7 @@
  * ftp.c:
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: ftp.c,v 1.11 2003/03/24 19:12:16 gbazin Exp $
+ * $Id: ftp.c,v 1.12 2003/03/24 20:00:51 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -832,6 +832,8 @@ static ssize_t NetRead( input_thread_t *p_input,
                             NULL, NULL, &timeout )) == 0
            || (i_ret < 0 && errno == EINTR) )
     {
+        FD_ZERO( &fds );
+        FD_SET( p_socket->i_handle, &fds );
         timeout.tv_sec  = 1;
         timeout.tv_usec = 0;
 

diff --git a/modules/access/http.c b/modules/access/http.c
index 474f2f5b97511937f6cf97eb866459bdccc06643..bfab1d49eb6bffab89af4df66e306dda8997e557 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -2,7 +2,7 @@
  * http.c: HTTP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: http.c,v 1.29 2003/03/24 19:12:16 gbazin Exp $
+ * $Id: http.c,v 1.30 2003/03/24 20:00:51 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -718,6 +718,8 @@ static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
 #endif
            )
     {
+        FD_ZERO( &fds );
+        FD_SET( p_access_data->i_handle, &fds );
         timeout.tv_sec = 0;
         timeout.tv_usec = 500000;
 

diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c
index 6f2b35909049295eb0de784a20df88e69ed1c84a..002d20df06fd12635a5ad8bfdb118fb0a386432f 100644 (file)
--- a/modules/access/mms/mms.c
+++ b/modules/access/mms/mms.c
@@ -2,7 +2,7 @@
  * mms.c: MMS access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mms.c,v 1.29 2003/03/24 19:12:16 gbazin Exp $
+ * $Id: mms.c,v 1.30 2003/03/24 20:00:51 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -1473,6 +1473,9 @@ static int  NetFillBuffer( input_thread_t *p_input )
                             NULL, NULL, &timeout )) == 0
            || (i_ret < 0 && errno == EINTR) )
     {
+        FD_ZERO( &fds );
+        if( i_tcp > 0 ) FD_SET( p_access->socket_tcp.i_handle, &fds );
+        if( i_udp > 0 ) FD_SET( p_access->socket_udp.i_handle, &fds );
         timeout.tv_sec = 0;
         timeout.tv_usec = 500000;
 

diff --git a/modules/access/udp.c b/modules/access/udp.c
index ac0e20606f24964235eca85541c4420c57775e09..f40804b0858bfffcf866fa0019a212c0d159ff8a 100644 (file)
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -2,7 +2,7 @@
  * udp.c: raw UDP & RTP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: udp.c,v 1.17 2003/03/24 19:12:16 gbazin Exp $
+ * $Id: udp.c,v 1.18 2003/03/24 20:00:51 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Tristan Leteurtre <tooney@via.ecp.fr>
@@ -339,6 +339,8 @@ static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
                             NULL, NULL, &timeout )) == 0
            || (i_ret < 0 && errno == EINTR) )
     {
+        FD_ZERO( &fds );
+        FD_SET( p_access_data->i_handle, &fds );
         timeout.tv_sec = 0;
         timeout.tv_usec = 500000;