<!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>[190140] branches/safari-601.1-branch/Source/WebCore</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/190140">190140</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-09-22 16:28:11 -0700 (Tue, 22 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rollout <a href="http://trac.webkit.org/projects/webkit/changeset/189200">r189200</a>. rdar://problem/22803080</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreplatformURLcpp">branches/safari-601.1-branch/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreplatformnetworkcfSynchronousResourceHandleCFURLConnectionDelegatecpp">branches/safari-601.1-branch/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (190139 => 190140)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-09-22 23:14:56 UTC (rev 190139)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-09-22 23:28:11 UTC (rev 190140)
</span><span class="lines">@@ -1,24 +1,3 @@
</span><del>-2015-09-22 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r189200. rdar://problem/22803080
-
- 2015-08-31 Brent Fulgham <bfulgham@apple.com>
-
- [Win] WebKit cannot load pages based on "file://" URLs
- https://bugs.webkit.org/show_bug.cgi?id=148596
- <rdar://problem/22432585>
-
- Reviewed by Dean Jackson.
-
- * platform/URL.cpp:
- (WebCore::URL::URL): Work around bug that causes this assertion to fire on
- the Apple Windows build.
- * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
- (WebCore::adjustMIMETypeIfNecessary): Added. If the URL is for a local file,
- determine the MIME type based on extension. Otherwise use the default MIME type.
- (WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse): If
- the CFURLResponse has no MIME type, call 'adjustMIMETypeIfNecessary'.
-
</del><span class="cx"> 2015-08-21 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r188769. rdar://problem/22354983
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/platform/URL.cpp (190139 => 190140)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/platform/URL.cpp 2015-09-22 23:14:56 UTC (rev 190139)
+++ branches/safari-601.1-branch/Source/WebCore/platform/URL.cpp 2015-09-22 23:28:11 UTC (rev 190140)
</span><span class="lines">@@ -432,12 +432,7 @@
</span><span class="cx"> URL::URL(ParsedURLStringTag, const String& url)
</span><span class="cx"> {
</span><span class="cx"> parse(url);
</span><del>-#if OS(WINDOWS)
- // FIXME(148598): Work around Windows local file handling bug in CFNetwork
- ASSERT(isLocalFile() || url == m_string);
-#else
</del><span class="cx"> ASSERT(url == m_string);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL::URL(const URL& base, const String& relative)
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreplatformnetworkcfSynchronousResourceHandleCFURLConnectionDelegatecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp (190139 => 190140)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2015-09-22 23:14:56 UTC (rev 190139)
+++ branches/safari-601.1-branch/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2015-09-22 23:28:11 UTC (rev 190140)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2004-2013, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2013 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -109,29 +109,6 @@
</span><span class="cx">
</span><span class="cx"> CFURLResponseSetMIMEType(response, defaultMIMETypeString);
</span><span class="cx"> }
</span><del>-
-static void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse)
-{
- RetainPtr<CFStringRef> result = CFURLResponseGetMIMEType(cfResponse);
- RetainPtr<CFStringRef> originalResult = result;
-
- if (!result) {
- CFURLRef cfURL = CFURLResponseGetURL(cfResponse);
- URL url(cfURL);
- if (url.isLocalFile()) {
- String mimeType = mimeTypeFromURL(url);
- result = mimeType.createCFString().leakRef();
- }
- }
-
- if (!result) {
- static CFStringRef defaultMIMETypeString = WebCore::defaultMIMEType().createCFString().leakRef();
- result = defaultMIMETypeString;
- }
-
- if (result != originalResult)
- CFURLResponseSetMIMEType(cfResponse, result.get());
-}
</del><span class="cx"> #endif // !PLATFORM(COCOA)
</span><span class="cx">
</span><span class="cx"> void SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse(CFURLConnectionRef connection, CFURLResponseRef cfResponse)
</span><span class="lines">@@ -154,9 +131,6 @@
</span><span class="cx"> wkSetCFURLResponseMIMEType(cfResponse, CFSTR("text/html"));
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx"> #else
</span><del>- if (!CFURLResponseGetMIMEType(cfResponse))
- adjustMIMETypeIfNecessary(cfResponse);
-
</del><span class="cx"> if (!CFURLResponseGetMIMEType(cfResponse)) {
</span><span class="cx"> // We should never be applying the default MIMEType if we told the networking layer to do content sniffing for handle.
</span><span class="cx"> ASSERT(!m_handle->shouldContentSniff());
</span></span></pre>
</div>
</div>
</body>
</html>