Changeset 212981 in webkit

Timestamp:

Feb 24, 2017 5:08:30 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

curl: Improve errors by including the domain
​https://bugs.webkit.org/show_bug.cgi?id=134340

Patch by Basuke Suzuki <​Basuke.Suzuki@am.sony.com> on 2017-02-24
Reviewed by Alex Christensen.

Added proper error domain to ResourceError created by
Curl problem.

• platform/network/curl/ResourceHandleManager.cpp:

(WebCore::ResourceHandleManager::downloadTimerCallback):
(WebCore::ResourceHandleManager::dispatchSynchronousJob):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-24  Basuke Suzuki  <Basuke.Suzuki@am.sony.com>
+
+        curl: Improve errors by including the domain
+        https://bugs.webkit.org/show_bug.cgi?id=134340
+
+        Reviewed by Alex Christensen.
+
+        Added proper error domain to ResourceError created by
+        Curl problem.
+
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::downloadTimerCallback):
+        (WebCore::ResourceHandleManager::dispatchSynchronousJob):
+
 2017-02-24  Antoine Quint  <graouts@apple.com>
 

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

@@ -86 +86 @@
 const double pollTimeSeconds = 0.05;
 const int maxRunningJobs = 128;
+const char* const errorDomainCurl = "CurlErrorDomain";
 
 URL getCurlEffectiveURL(CURL* handle)
@@ -713 +714 @@
 #endif
             if (d->client()) {
-                ResourceError resourceError(String(), msg->data.result, url, String(curl_easy_strerror(msg->data.result)));
+                ResourceError resourceError(ASCIILiteral(errorDomainCurl), msg->data.result, url, String(curl_easy_strerror(msg->data.result)));
                 resourceError.setSSLErrors(d->m_sslErrors);
                 d->client()->didFail(job, resourceError);
@@ -990 +991 @@
 
     if (ret != CURLE_OK) {
-        ResourceError error(String(handle->m_url), ret, kurl, String(curl_easy_strerror(ret)));
+        ResourceError error(ASCIILiteral(errorDomainCurl), ret, kurl, String(curl_easy_strerror(ret)));
         error.setSSLErrors(handle->m_sslErrors);
         handle->client()->didFail(job, error);