Changeset 227237 in webkit

Timestamp:

Jan 19, 2018 2:33:51 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Add timeout support to XMLHttpRequest
​https://bugs.webkit.org/show_bug.cgi?id=181876

Patch by Basuke Suzuki <Basuke Suzuki> on 2018-01-19
Reviewed by Alex Christensen

• platform/network/ResourceRequestBase.cpp:
• platform/network/curl/CurlContext.cpp:

(WebCore::CurlHandle::setTimeout):

• platform/network/curl/CurlContext.h:
• platform/network/curl/CurlRequest.cpp:

(WebCore::CurlRequest::setupTransfer):
(WebCore::CurlRequest::didCompleteTransfer):

• platform/network/curl/ResourceError.h:
• platform/network/curl/ResourceErrorCurl.cpp:

(WebCore::ResourceError::httpError):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/ResourceRequestBase.cpp (modified) (1 diff)
• platform/network/curl/CurlContext.cpp (modified) (1 diff)
• platform/network/curl/CurlContext.h (modified) (1 diff)
• platform/network/curl/CurlRequest.cpp (modified) (2 diffs)
• platform/network/curl/ResourceError.h (modified) (1 diff)
• platform/network/curl/ResourceErrorCurl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-19  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [Curl] Add timeout support to XMLHttpRequest
+        https://bugs.webkit.org/show_bug.cgi?id=181876
+
+        Reviewed by Alex Christensen 
+
+        * platform/network/ResourceRequestBase.cpp:
+        * platform/network/curl/CurlContext.cpp:
+        (WebCore::CurlHandle::setTimeout):
+        * platform/network/curl/CurlContext.h:
+        * platform/network/curl/CurlRequest.cpp:
+        (WebCore::CurlRequest::setupTransfer):
+        (WebCore::CurlRequest::didCompleteTransfer):
+        * platform/network/curl/ResourceError.h:
+        * platform/network/curl/ResourceErrorCurl.cpp:
+        (WebCore::ResourceError::httpError):
+
 2018-01-19  Yoav Weiss  <yoav@yoav.ws>
 

trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp

@@ -34 +34 @@
 namespace WebCore {
 
-#if !USE(SOUP) && (!PLATFORM(MAC) || USE(CFURLCONNECTION))
+#if PLATFORM(IOS) || USE(CFURLCONNECTION)
 double ResourceRequestBase::s_defaultTimeoutInterval = INT_MAX;
 #else

trunk/Source/WebCore/platform/network/curl/CurlContext.cpp

@@ -521 +521 @@
 }
 
+void CurlHandle::setTimeout(long timeoutMilliseconds)
+{
+    curl_easy_setopt(m_handle, CURLOPT_TIMEOUT_MS, timeoutMilliseconds);
+}
+
 void CurlHandle::setHeaderCallbackFunction(curl_write_callback callbackFunc, void* userData)
 {

trunk/Source/WebCore/platform/network/curl/CurlContext.h

@@ -264 +264 @@
 
     void enableTimeout();
+    void setTimeout(long timeoutMilliseconds);
 
     // Callback function

trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp

@@ -193 +193 @@
     m_curlHandle->enableTimeout();
 
+    long timeoutMilliseconds = (m_request.timeoutInterval() > 0.0) ? static_cast<long>(m_request.timeoutInterval() * 1000.0) : 0;
+    m_curlHandle->setTimeout(timeoutMilliseconds);
+
     m_curlHandle->enableProxyIfExists();
     m_curlHandle->enableCookieJarIfExists();
@@ -422 +425 @@
         }
     } else {
-        auto resourceError = ResourceError::httpError(result, m_request.url());
+        auto type = (result == CURLE_OPERATION_TIMEDOUT && m_request.timeoutInterval() > 0.0) ? ResourceError::Type::Timeout : ResourceError::Type::General;
+        auto resourceError = ResourceError::httpError(result, m_request.url(), type);
         if (m_sslVerifier.sslErrors())
             resourceError.setSslErrors(m_sslVerifier.sslErrors());

trunk/Source/WebCore/platform/network/curl/ResourceError.h

@@ -45 +45 @@
     }
 
-    static ResourceError httpError(int errorCode, const URL& failingURL);
+    static ResourceError httpError(int errorCode, const URL& failingURL, Type = Type::General);
     static ResourceError sslError(int errorCode, unsigned sslErrors, const URL& failingURL);
 

trunk/Source/WebCore/platform/network/curl/ResourceErrorCurl.cpp

@@ -35 +35 @@
 const char* const ResourceError::curlErrorDomain = "CurlErrorDomain";
 
-ResourceError ResourceError::httpError(int errorCode, const URL& failingURL)
+ResourceError ResourceError::httpError(int errorCode, const URL& failingURL, Type type)
 {
-    return ResourceError(curlErrorDomain, errorCode, failingURL, CurlHandle::errorDescription(static_cast<CURLcode>(errorCode)));
+    return ResourceError(curlErrorDomain, errorCode, failingURL, CurlHandle::errorDescription(static_cast<CURLcode>(errorCode)), type);
 }