<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197606] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197606">197606</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-04 19:30:19 -0800 (Fri, 04 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix file mime-types when using NetworkSession
https://bugs.webkit.org/show_bug.cgi?id=155058
Patch by Alex Christensen <achristensen@webkit.org> on 2016-03-04
Reviewed by Andy Estes.
Source/WebCore:
This fixes platform/mac/fast/loader/file-url-mimetypes-3.html
and platform/mac/fast/loader/file-url-mimetypes.html.
* platform/network/mac/WebCoreURLResponse.h:
Source/WebKit2:
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTask::NetworkDataTask):
Call adjustMIMETypeIfNecessary like we do in connection didReceiveResponse in
WebCoreResourceHandleAsOperationQueueDelegate.mm.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
Don't content sniff file urls. This check is analogous to ResourceHandle::shouldContentSniffURL.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreURLResponseh">trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkDataTaskCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197605 => 197606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-05 01:35:12 UTC (rev 197605)
+++ trunk/Source/WebCore/ChangeLog 2016-03-05 03:30:19 UTC (rev 197606)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-04 Alex Christensen <achristensen@webkit.org>
+
+ Fix file mime-types when using NetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=155058
+
+ Reviewed by Andy Estes.
+
+ This fixes platform/mac/fast/loader/file-url-mimetypes-3.html
+ and platform/mac/fast/loader/file-url-mimetypes.html.
+
+ * platform/network/mac/WebCoreURLResponse.h:
+
</ins><span class="cx"> 2016-03-04 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebKit2] Add WebKit2 equivalent of -[WebView _insertNewlineInQuotedContent]
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreURLResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.h (197605 => 197606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.h 2016-03-05 01:35:12 UTC (rev 197605)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.h 2016-03-05 03:30:19 UTC (rev 197606)
</span><span class="lines">@@ -43,5 +43,5 @@
</span><span class="cx"> #endif // __OBJC__
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-void adjustMIMETypeIfNecessary(CFURLResponseRef);
</del><ins>+WEBCORE_EXPORT void adjustMIMETypeIfNecessary(CFURLResponseRef);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197605 => 197606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-05 01:35:12 UTC (rev 197605)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-05 03:30:19 UTC (rev 197606)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-04 Alex Christensen <achristensen@webkit.org>
+
+ Fix file mime-types when using NetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=155058
+
+ Reviewed by Andy Estes.
+
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (WebKit::NetworkDataTask::NetworkDataTask):
+ Call adjustMIMETypeIfNecessary like we do in connection didReceiveResponse in
+ WebCoreResourceHandleAsOperationQueueDelegate.mm.
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
+ Don't content sniff file urls. This check is analogous to ResourceHandle::shouldContentSniffURL.
+
</ins><span class="cx"> 2016-03-04 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebKit2] Add WebKit2 equivalent of -[WebView _insertNewlineInQuotedContent]
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkDataTaskCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (197605 => 197606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2016-03-05 01:35:12 UTC (rev 197605)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2016-03-05 03:30:19 UTC (rev 197606)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> NSURLRequest *nsRequest = request.nsURLRequest(WebCore::UpdateHTTPBody);
</span><del>- if (shouldContentSniff == WebCore::DoNotSniffContent) {
</del><ins>+ if (shouldContentSniff == WebCore::DoNotSniffContent || url.protocolIs("file")) {
</ins><span class="cx"> NSMutableURLRequest *mutableRequest = [[nsRequest mutableCopy] autorelease];
</span><span class="cx"> [mutableRequest _setProperty:@(NO) forKey:(NSString *)_kCFURLConnectionPropertyShouldSniff];
</span><span class="cx"> nsRequest = mutableRequest;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (197605 => 197606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-03-05 01:35:12 UTC (rev 197605)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-03-05 03:30:19 UTC (rev 197606)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #import <WebCore/ResourceResponse.h>
</span><span class="cx"> #import <WebCore/SharedBuffer.h>
</span><span class="cx"> #import <WebCore/URL.h>
</span><ins>+#import <WebCore/WebCoreURLResponse.h>
</ins><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -166,6 +167,12 @@
</span><span class="cx"> auto storedCredentials = session.configuration.URLCredentialStorage ? WebCore::StoredCredentials::AllowStoredCredentials : WebCore::StoredCredentials::DoNotAllowStoredCredentials;
</span><span class="cx"> if (auto* networkDataTask = _session->dataTaskForIdentifier(dataTask.taskIdentifier, storedCredentials)) {
</span><span class="cx"> ASSERT(isMainThread());
</span><ins>+
+ // Avoid MIME type sniffing if the response comes back as 304 Not Modified.
+ int statusCode = [response respondsToSelector:@selector(statusCode)] ? [(id)response statusCode] : 0;
+ if (statusCode != 304)
+ WebCore::adjustMIMETypeIfNecessary(response._CFURLResponse);
+
</ins><span class="cx"> WebCore::ResourceResponse resourceResponse(response);
</span><span class="cx"> copyTimingData([dataTask _timingData], resourceResponse.resourceLoadTiming());
</span><span class="cx"> auto completionHandlerCopy = Block_copy(completionHandler);
</span></span></pre>
</div>
</div>
</body>
</html>