[FFmpeg-cvslog] r25154 - trunk/libavformat/tcp.c

[mstorsjo]

Author: mstorsjo
Date: Tue Sep 21 22:17:34 2010
New Revision: 25154

Log:
tcp: Check both wfds and efds when waiting for the result from connect

On windows, a connection failure doesn't trigger wfds as it does on unix.

This fixes issue 2237, based on code by yeyingxian.

Modified:
   trunk/libavformat/tcp.c

Modified: trunk/libavformat/tcp.c
==============================================================================
--- trunk/libavformat/tcp.c	Tue Sep 21 19:57:21 2010	(r25153)
+++ trunk/libavformat/tcp.c	Tue Sep 21 22:17:34 2010	(r25154)
@@ -38,7 +38,7 @@ static int tcp_open(URLContext *h, const
     struct addrinfo hints, *ai, *cur_ai;
     int port, fd = -1;
     TCPContext *s = NULL;
-    fd_set wfds;
+    fd_set wfds, efds;
     int fd_max, ret;
     struct timeval tv;
     socklen_t optlen;
@@ -87,11 +87,13 @@ static int tcp_open(URLContext *h, const
             }
             fd_max = fd;
             FD_ZERO(&wfds);
+            FD_ZERO(&efds);
             FD_SET(fd, &wfds);
+            FD_SET(fd, &efds);
             tv.tv_sec = 0;
             tv.tv_usec = 100 * 1000;
-            ret = select(fd_max + 1, NULL, &wfds, NULL, &tv);
-            if (ret > 0 && FD_ISSET(fd, &wfds))
+            ret = select(fd_max + 1, NULL, &wfds, &efds, &tv);
+            if (ret > 0 && (FD_ISSET(fd, &wfds) || FD_ISSET(fd, &efds)))
                 break;
         }