<!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>[174866] trunk</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/174866">174866</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-10-18 15:54:14 -0700 (Sat, 18 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/173356">r173356</a>): Safari can't install a profile, gets 'Download Failed error
https://bugs.webkit.org/show_bug.cgi?id=137855
Reviewed by Dan Bernstein.
Source/WebCore:
We lose the sniffed MIME type for the response when synthesizing an NSURLResponse. Sniffing requires
backchannel data that the synthesized response doesn't have.
Test: http/tests/mime/mime-type-sniff.html
* platform/network/mac/ResourceResponseMac.mm:
(WebCore::ResourceResponse::initNSURLResponse):
When synthesizing NSURLResponse explicitly set the Content-type header to the sniffed type.
Tools:
Test and warn if the dumped response mime type differs from the platform response mime type.
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didReceiveResponseForResource):
(WTR::InjectedBundlePage::platformResponseMimeType):
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
* WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:
(WTR::InjectedBundlePage::platformResponseMimeType):
LayoutTests:
* http/tests/mime/mime-type-sniff-expected.txt: Added.
* http/tests/mime/mime-type-sniff.html: Added.
* http/tests/mime/resources/png-with-text-content-type.cgi: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceResponseMacmm">trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePageh">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlecocoaInjectedBundlePageCocoamm">trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmimemimetypesniffexpectedtxt">trunk/LayoutTests/http/tests/mime/mime-type-sniff-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmimemimetypesniffhtml">trunk/LayoutTests/http/tests/mime/mime-type-sniff.html</a></li>
<li><a href="#trunkLayoutTestshttptestsmimeresourcespngwithtextcontenttypecgi">trunk/LayoutTests/http/tests/mime/resources/png-with-text-content-type.cgi</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (174865 => 174866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-18 21:48:33 UTC (rev 174865)
+++ trunk/LayoutTests/ChangeLog 2014-10-18 22:54:14 UTC (rev 174866)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-10-18 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r173356): Safari can't install a profile, gets 'Download Failed error
+ https://bugs.webkit.org/show_bug.cgi?id=137855
+
+ Reviewed by Dan Bernstein.
+
+ * http/tests/mime/mime-type-sniff-expected.txt: Added.
+ * http/tests/mime/mime-type-sniff.html: Added.
+ * http/tests/mime/resources/png-with-text-content-type.cgi: Added.
+
</ins><span class="cx"> 2014-10-18 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Tables with <colgroups> are not reporting table column headers
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmimemimetypesniffexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/mime/mime-type-sniff-expected.txt (0 => 174866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/mime/mime-type-sniff-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/mime/mime-type-sniff-expected.txt 2014-10-18 22:54:14 UTC (rev 174866)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+png-with-text-content-type.cgi has MIME type image/png
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmimemimetypesniffhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/mime/mime-type-sniff.html (0 => 174866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/mime/mime-type-sniff.html (rev 0)
+++ trunk/LayoutTests/http/tests/mime/mime-type-sniff.html 2014-10-18 22:54:14 UTC (rev 174866)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpResourceResponseMIMETypes();
+ testRunner.dumpAsText();
+}
+</script>
+<img src="resources/png-with-text-content-type.cgi" onload="testRunner.notifyDone()">
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmimeresourcespngwithtextcontenttypecgi"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/mime/resources/png-with-text-content-type.cgi (0 => 174866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/mime/resources/png-with-text-content-type.cgi (rev 0)
+++ trunk/LayoutTests/http/tests/mime/resources/png-with-text-content-type.cgi 2014-10-18 22:54:14 UTC (rev 174866)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+#!/usr/bin/perl -w
+
+use CGI;
+use HTTP::Date;
+
+print "Content-type: text/plain\n";
+print "\n";
+
+my $file = "../../css/resources/abe.png";
+
+open (FH,'<', $file) || die "Could not open $file: $!";
+my $buffer = "";
+while (read(FH, $buffer, 10240)) {
+ print $buffer;
+}
+close(FH);
</ins><span class="cx">Property changes on: trunk/LayoutTests/http/tests/mime/resources/png-with-text-content-type.cgi
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174865 => 174866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-18 21:48:33 UTC (rev 174865)
+++ trunk/Source/WebCore/ChangeLog 2014-10-18 22:54:14 UTC (rev 174866)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-10-18 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r173356): Safari can't install a profile, gets 'Download Failed error
+ https://bugs.webkit.org/show_bug.cgi?id=137855
+
+ Reviewed by Dan Bernstein.
+
+ We lose the sniffed MIME type for the response when synthesizing an NSURLResponse. Sniffing requires
+ backchannel data that the synthesized response doesn't have.
+
+ Test: http/tests/mime/mime-type-sniff.html
+
+ * platform/network/mac/ResourceResponseMac.mm:
+ (WebCore::ResourceResponse::initNSURLResponse):
+
+ When synthesizing NSURLResponse explicitly set the Content-type header to the sniffed type.
+
</ins><span class="cx"> 2014-10-18 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Use Fast enumeration consistently in WebFontCache.mm
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceResponseMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm (174865 => 174866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm 2014-10-18 21:48:33 UTC (rev 174865)
+++ trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm 2014-10-18 22:54:14 UTC (rev 174866)
</span><span class="lines">@@ -66,6 +66,9 @@
</span><span class="cx"> [headerDictionary setObject:(NSString *)header.value forKey:(NSString *)header.key];
</span><span class="cx">
</span><span class="cx"> m_nsResponse = adoptNS([[NSHTTPURLResponse alloc] initWithURL:m_url statusCode:m_httpStatusCode HTTPVersion:(NSString*)kCFHTTPVersion1_1 headerFields:headerDictionary]);
</span><ins>+
+ // Mime type sniffing doesn't work with a synthesized response.
+ [m_nsResponse.get() _setMIMEType:(NSString *)m_mimeType];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174865 => 174866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-18 21:48:33 UTC (rev 174865)
+++ trunk/Tools/ChangeLog 2014-10-18 22:54:14 UTC (rev 174866)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-18 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r173356): Safari can't install a profile, gets 'Download Failed error
+ https://bugs.webkit.org/show_bug.cgi?id=137855
+
+ Reviewed by Dan Bernstein.
+
+ Test and warn if the dumped response mime type differs from the platform response mime type.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::didReceiveResponseForResource):
+ (WTR::InjectedBundlePage::platformResponseMimeType):
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
+ * WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:
+ (WTR::InjectedBundlePage::platformResponseMimeType):
+
</ins><span class="cx"> 2014-10-17 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove run-inspector-perf-tests.py there is no PerformanceTests/inspector anymore
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (174865 => 174866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2014-10-18 21:48:33 UTC (rev 174865)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2014-10-18 22:54:14 UTC (rev 174866)
</span><span class="lines">@@ -1131,7 +1131,15 @@
</span><span class="cx"> stringBuilder.append(toWTFString(urlString));
</span><span class="cx"> stringBuilder.appendLiteral(" has MIME type ");
</span><span class="cx"> stringBuilder.append(toWTFString(mimeTypeString));
</span><ins>+
+ String platformMimeType = platformResponseMimeType(response);
+ if (!platformMimeType.isEmpty() && platformMimeType != toWTFString(mimeTypeString)) {
+ stringBuilder.appendLiteral(" but platform response has ");
+ stringBuilder.append(platformMimeType);
+ }
+
</ins><span class="cx"> stringBuilder.append('\n');
</span><ins>+
</ins><span class="cx"> InjectedBundle::shared().outputText(stringBuilder.toString());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1867,6 +1875,11 @@
</span><span class="cx"> void InjectedBundlePage::platformDidStartProvisionalLoadForFrame(WKBundleFrameRef)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
+String InjectedBundlePage::platformResponseMimeType(WKURLResponseRef)
+{
+ return String();
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::frameDidChangeLocation(WKBundleFrameRef frame, bool shouldDump)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePageh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h (174865 => 174866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h 2014-10-18 21:48:33 UTC (rev 174865)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h 2014-10-18 22:54:14 UTC (rev 174866)
</span><span class="lines">@@ -169,6 +169,7 @@
</span><span class="cx"> void dumpDOMAsWebArchive(WKBundleFrameRef, WTF::StringBuilder&);
</span><span class="cx">
</span><span class="cx"> void platformDidStartProvisionalLoadForFrame(WKBundleFrameRef);
</span><ins>+ String platformResponseMimeType(WKURLResponseRef);
</ins><span class="cx">
</span><span class="cx"> void frameDidChangeLocation(WKBundleFrameRef, bool shouldDump = false);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlecocoaInjectedBundlePageCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm (174865 => 174866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm 2014-10-18 21:48:33 UTC (rev 174865)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm 2014-10-18 22:54:14 UTC (rev 174866)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #import <WebKit/WKBundleFrame.h>
</span><span class="cx"> #import <WebKit/WKBundlePagePrivate.h>
</span><span class="cx"> #import <WebKit/WKURLCF.h>
</span><ins>+#import <WebKit/WKURLResponseNS.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span><span class="lines">@@ -48,4 +49,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String InjectedBundlePage::platformResponseMimeType(WKURLResponseRef response)
+{
+ RetainPtr<NSURLResponse> nsURLResponse = adoptNS(WKURLResponseCopyNSURLResponse(response));
+ return [nsURLResponse.get() MIMEType];
+}
+
</ins><span class="cx"> } // namespace WTR
</span></span></pre>
</div>
</div>
</body>
</html>