Title: [199684] trunk/Source/WebCore
- Revision
- 199684
- Author
- [email protected]
- Date
- 2016-04-18 13:26:12 -0700 (Mon, 18 Apr 2016)
Log Message
Unreviewed, fix iOS9 build after r199682.
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
(WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (199683 => 199684)
--- trunk/Source/WebCore/ChangeLog 2016-04-18 20:02:24 UTC (rev 199683)
+++ trunk/Source/WebCore/ChangeLog 2016-04-18 20:26:12 UTC (rev 199684)
@@ -1,5 +1,12 @@
2016-04-18 Chris Dumez <[email protected]>
+ Unreviewed, fix iOS9 build after r199682.
+
+ * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
+ (WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):
+
+2016-04-18 Chris Dumez <[email protected]>
+
[WK2][iOS] Only adjust network responses' MIME type for QuickLook in the context of a main resource load
https://bugs.webkit.org/show_bug.cgi?id=156639
<rdar://problem/25765848>
Modified: trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp (199683 => 199684)
--- trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2016-04-18 20:02:24 UTC (rev 199683)
+++ trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2016-04-18 20:26:12 UTC (rev 199684)
@@ -147,8 +147,10 @@
auto msg = CFURLResponseGetHTTPResponse(cfResponse);
int statusCode = msg ? CFHTTPMessageGetResponseStatusCode(msg) : 0;
- if (statusCode != 304)
- adjustMIMETypeIfNecessary(cfResponse);
+ if (statusCode != 304) {
+ bool isMainResourceLoad = m_handle->firstRequest().requester() == ResourceRequest::Requester::Main;
+ adjustMIMETypeIfNecessary(cfResponse, isMainResourceLoad);
+ }
#if !PLATFORM(IOS)
if (_CFURLRequestCopyProtocolPropertyForKey(m_handle->firstRequest().cfURLRequest(DoNotUpdateHTTPBody), CFSTR("ForceHTMLMIMEType")))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
