From bdef26be9db2d45cf2cfab7ef1cb7ca44af57447 Mon Sep 17 00:00:00 2001 From: "don.olmstead@sony.com" Date: Fri, 5 Jan 2018 23:13:35 +0000 Subject: [PATCH] [curl] Can't load file:// URL with a URL fragment identifier https://bugs.webkit.org/show_bug.cgi?id=181170 Reviewed by Alex Christensen. No new tests. No change in behavior. * platform/network/curl/CurlRequest.cpp: (WebCore::CurlRequest::invokeDidReceiveResponseForFile): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226466 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 12 ++++++++++++ Source/WebCore/platform/network/curl/CurlRequest.cpp | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index e09067a..1a5a077 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,5 +1,17 @@ 2018-01-05 Don Olmstead + [curl] Can't load file:// URL with a URL fragment identifier + https://bugs.webkit.org/show_bug.cgi?id=181170 + + Reviewed by Alex Christensen. + + No new tests. No change in behavior. + + * platform/network/curl/CurlRequest.cpp: + (WebCore::CurlRequest::invokeDidReceiveResponseForFile): + +2018-01-05 Don Olmstead + TextCodec uses std::array but does not include it https://bugs.webkit.org/show_bug.cgi?id=181340 diff --git a/Source/WebCore/platform/network/curl/CurlRequest.cpp b/Source/WebCore/platform/network/curl/CurlRequest.cpp index 9b7ea53..c03b0c2 100644 --- a/Source/WebCore/platform/network/curl/CurlRequest.cpp +++ b/Source/WebCore/platform/network/curl/CurlRequest.cpp @@ -504,7 +504,7 @@ void CurlRequest::invokeDidReceiveResponseForFile(URL& url) m_response.statusCode = 200; // Determine the MIME type based on the path. - m_response.headers.append(String("Content-Type: " + MIMETypeRegistry::getMIMETypeForPath(m_response.url))); + m_response.headers.append(String("Content-Type: " + MIMETypeRegistry::getMIMETypeForPath(m_response.url.path()))); if (!m_isSyncRequest) { // DidReceiveResponse must not be called immediately -- 1.8.3.1