Changeset 30121 in webkit

Timestamp:

Feb 10, 2008, 11:02:43 AM (18 years ago)

Author:

kevino@webkit.org

Message:

Don't call select() for CURL when there are no valid file descriptors.
​http://bugs.webkit.org/show_bug.cgi?id=17178

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/ResourceHandleManager.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-09  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Reviewed by Eric Seidel.
+
+        Calling select() when all the file descriptors are NULL
+        stops the file download on Windows. As a result, do not
+        call select() when there are no valid descriptors.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17178
+
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::downloadTimerCallback):
+
 2008-02-09  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/platform/network/curl/ResourceHandleManager.cpp

@@ -272 +272 @@
     // Temporarily disable timers since signals may interrupt select(), raising EINTR errors on some platforms
     setDeferringTimers(true);
-    int rc;
+    int rc = 0;
     do {
         FD_ZERO(&fdread);
@@ -278 +278 @@
         FD_ZERO(&fdexcep);
         curl_multi_fdset(m_curlMultiHandle, &fdread, &fdwrite, &fdexcep, &maxfd);
-        rc = ::select(maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout);
+        // When the 3 file descriptors are empty, winsock will return -1
+        // and bail out, stopping the file download. So make sure we
+        // have valid file descriptors before calling select.
+        if (maxfd >= 0)
+            rc = ::select(maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout);
     } while (rc == -1 && errno == EINTR);
     setDeferringTimers(false);