[Curl] Compile errors.
authorpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Dec 2015 02:24:29 +0000 (02:24 +0000)
committerpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Dec 2015 02:24:29 +0000 (02:24 +0000)
https://bugs.webkit.org/show_bug.cgi?id=152563

Reviewed by Alex Christensen.

The ResourceError constructor has changed signature.

* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::ResourceHandleManager::downloadTimerCallback):
(WebCore::ResourceHandleManager::dispatchSynchronousJob):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 58c5f86..9b3de59 100644 (file)
@@ -1,3 +1,16 @@
+2015-12-26  Per Arne Vollan  <peavo@outlook.com>
+
+        [Curl] Compile errors.
+        https://bugs.webkit.org/show_bug.cgi?id=152563
+
+        Reviewed by Alex Christensen.
+
+        The ResourceError constructor has changed signature.
+
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::downloadTimerCallback):
+        (WebCore::ResourceHandleManager::dispatchSynchronousJob):
+
 2015-12-25  Zalan Bujtas  <zalan@apple.com>
 
         Subpixel rendering: Add subpixel support for outline.
index c9e43da..cd977bb 100644 (file)
@@ -706,7 +706,7 @@ void ResourceHandleManager::downloadTimerCallback()
             fprintf(stderr, "Curl ERROR for url='%s', error: '%s'\n", url, curl_easy_strerror(msg->data.result));
 #endif
             if (d->client()) {
-                ResourceError resourceError(String(), msg->data.result, String(url), String(curl_easy_strerror(msg->data.result)));
+                ResourceError resourceError(String(), msg->data.result, URL(ParsedURLString, String(url)), String(curl_easy_strerror(msg->data.result)));
                 resourceError.setSSLErrors(d->m_sslErrors);
                 d->client()->didFail(job, resourceError);
                 CurlCacheManager::getInstance().didFail(*job);
@@ -920,7 +920,7 @@ void ResourceHandleManager::dispatchSynchronousJob(ResourceHandle* job)
     CURLcode ret =  curl_easy_perform(handle->m_handle);
 
     if (ret != CURLE_OK) {
-        ResourceError error(String(handle->m_url), ret, String(handle->m_url), String(curl_easy_strerror(ret)));
+        ResourceError error(String(handle->m_url), ret, kurl, String(curl_easy_strerror(ret)));
         error.setSSLErrors(handle->m_sslErrors);
         handle->client()->didFail(job, error);
     } else {