Title: [212981] trunk/Source/WebCore
- Revision
- 212981
- Author
- commit-qu...@webkit.org
- Date
- 2017-02-24 17:08:30 -0800 (Fri, 24 Feb 2017)
Log Message
curl: Improve errors by including the domain
https://bugs.webkit.org/show_bug.cgi?id=134340
Patch by Basuke Suzuki <basuke.suz...@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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (212980 => 212981)
--- trunk/Source/WebCore/ChangeLog 2017-02-25 01:03:30 UTC (rev 212980)
+++ trunk/Source/WebCore/ChangeLog 2017-02-25 01:08:30 UTC (rev 212981)
@@ -1,3 +1,17 @@
+2017-02-24 Basuke Suzuki <basuke.suz...@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 <grao...@apple.com>
[Modern Media Controls] <audio> controls should center in their container when the page is scaled
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (212980 => 212981)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2017-02-25 01:03:30 UTC (rev 212980)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2017-02-25 01:08:30 UTC (rev 212981)
@@ -85,6 +85,7 @@
const int selectTimeoutMS = 5;
const double pollTimeSeconds = 0.05;
const int maxRunningJobs = 128;
+const char* const errorDomainCurl = "CurlErrorDomain";
URL getCurlEffectiveURL(CURL* handle)
{
@@ -712,7 +713,7 @@
fprintf(stderr, "Curl ERROR for url='', error: '%s'\n", url.string().utf8().data(), curl_easy_strerror(msg->data.result));
#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);
CurlCacheManager::getInstance().didFail(*job);
@@ -989,7 +990,7 @@
CURLcode ret = curl_easy_perform(handle->m_handle);
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);
} else {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
