<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[23949] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/23949">23949</a></dd>
<dt>Author</dt> <dd>sullivan</dd>
<dt>Date</dt> <dd>2007-07-03 12:22:28 -0700 (Tue, 03 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Written by Darin, reviewed by me
- fixed <rdar://problem/5249730> REGRESSION (Leopard, around 9A464): Safari opens the same local
documents more than once due to canonicalization change
* loader/mac/LoaderNSURLExtras.m:
(canonicalURL):
pass URL through KURL so we get KURL's version of canonicalization as well as
NSURLProtocol's version of canonicalization</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreloadermacLoaderNSURLExtrasm">trunk/WebCore/loader/mac/LoaderNSURLExtras.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (23948 => 23949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-07-03 19:14:44 UTC (rev 23948)
+++ trunk/WebCore/ChangeLog 2007-07-03 19:22:28 UTC (rev 23949)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2007-07-03 John Sullivan <sullivan@apple.com>
+
+ Written by Darin, reviewed by me
+
+ - fixed <rdar://problem/5249730> REGRESSION (Leopard, around 9A464): Safari opens the same local
+ documents more than once due to canonicalization change
+
+ * loader/mac/LoaderNSURLExtras.m:
+ (canonicalURL):
+ pass URL through KURL so we get KURL's version of canonicalization as well as
+ NSURLProtocol's version of canonicalization
+
</ins><span class="cx"> 2007-07-03 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin.
</span></span></pre></div>
<a id="trunkWebCoreloadermacLoaderNSURLExtrasm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/mac/LoaderNSURLExtras.m (23948 => 23949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/mac/LoaderNSURLExtras.m 2007-07-03 19:14:44 UTC (rev 23948)
+++ trunk/WebCore/loader/mac/LoaderNSURLExtras.m 2007-07-03 19:22:28 UTC (rev 23949)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!url)
</span><span class="cx"> return nil;
</span><del>-
</del><ins>+
</ins><span class="cx"> NSURLRequest *request = [[NSURLRequest alloc] initWithURL:url];
</span><span class="cx"> Class concreteClass = wkNSURLProtocolClassForReqest(request);
</span><span class="cx"> if (!concreteClass) {
</span><span class="lines">@@ -186,13 +186,13 @@
</span><span class="cx"> return url;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSURL *result = nil;
</del><ins>+ // Get NSURLProtocol's idea of canonical URL
</ins><span class="cx"> NSURLRequest *newRequest = [concreteClass canonicalRequestForRequest:request];
</span><del>- NSURL *newURL = [newRequest URL];
- result = [[newURL retain] autorelease];
</del><ins>+ KURL newURL = [newRequest URL];
</ins><span class="cx"> [request release];
</span><span class="cx">
</span><del>- return result;
</del><ins>+ // pass through KURL to get KURL's idea of canonical URL
+ return newURL.getNSURL();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool vectorContainsString(Vector<String> vector, String string)
</span></span></pre>
</div>
</div>
</body>
</html>