<!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>[171545] trunk/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/171545">171545</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 16:01:43 -0700 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Attempted Windows build fix.
* platform/network/cf/AuthenticationCF.cpp:
(WebCore::AuthenticationChallenge::AuthenticationChallenge):
* platform/network/cf/CredentialStorageCFNet.cpp:
(WebCore::CredentialStorage::getFromPersistentStorage):
* platform/network/cf/ProtectionSpaceCFNet.cpp:
(WebCore::ProtectionSpace::receivesCredentialSecurely):
(WebCore::ProtectionSpaceBase::receivesCredentialSecurely): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfAuthenticationCFcpp">trunk/Source/WebCore/platform/network/cf/AuthenticationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCredentialStorageCFNetcpp">trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfProtectionSpaceCFNetcpp">trunk/Source/WebCore/platform/network/cf/ProtectionSpaceCFNet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171544 => 171545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-24 23:01:42 UTC (rev 171544)
+++ trunk/Source/WebCore/ChangeLog        2014-07-24 23:01:43 UTC (rev 171545)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-07-24 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ Attempted Windows build fix.
+
+ * platform/network/cf/AuthenticationCF.cpp:
+ (WebCore::AuthenticationChallenge::AuthenticationChallenge):
+ * platform/network/cf/CredentialStorageCFNet.cpp:
+ (WebCore::CredentialStorage::getFromPersistentStorage):
+ * platform/network/cf/ProtectionSpaceCFNet.cpp:
+ (WebCore::ProtectionSpace::receivesCredentialSecurely):
+ (WebCore::ProtectionSpaceBase::receivesCredentialSecurely): Deleted.
+
+2014-07-24 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> <rdar://problem/17766348> [Cocoa] WebCore::ProtectionSpace doesn’t preserve all NSURLProtectionSpace properties, such as the distinguishedNames array
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135229
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfAuthenticationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/AuthenticationCF.cpp (171544 => 171545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/AuthenticationCF.cpp        2014-07-24 23:01:42 UTC (rev 171544)
+++ trunk/Source/WebCore/platform/network/cf/AuthenticationCF.cpp        2014-07-24 23:01:43 UTC (rev 171545)
</span><span class="lines">@@ -53,7 +53,11 @@
</span><span class="cx">
</span><span class="cx"> AuthenticationChallenge::AuthenticationChallenge(CFURLAuthChallengeRef cfChallenge,
</span><span class="cx"> AuthenticationClient* authenticationClient)
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> : AuthenticationChallengeBase(ProtectionSpace(CFURLAuthChallengeGetProtectionSpace(cfChallenge)),
</span><ins>+#else
+ : AuthenticationChallengeBase(core(CFURLAuthChallengeGetProtectionSpace(cfChallenge)),
+#endif
</ins><span class="cx"> core(CFURLAuthChallengeGetProposedCredential(cfChallenge)),
</span><span class="cx"> CFURLAuthChallengeGetPreviousFailureCount(cfChallenge),
</span><span class="cx"> (CFURLResponseRef)CFURLAuthChallengeGetFailureResponse(cfChallenge),
</span><span class="lines">@@ -90,7 +94,13 @@
</span><span class="cx">
</span><span class="cx"> CFURLCredentialRef credential = createCF(coreChallenge.proposedCredential());
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> CFURLAuthChallengeRef result = CFURLAuthChallengeCreate(0, coreChallenge.protectionSpace().cfSpace(), credential,
</span><ins>+#else
+ RetainPtr<CFURLProtectionSpaceRef> protectionSpace = adoptCF(createCF(coreChallenge.protectionSpace()));
+
+ CFURLAuthChallengeRef result = CFURLAuthChallengeCreate(0, protectionSpace, credential,
+#endif
</ins><span class="cx"> coreChallenge.previousFailureCount(),
</span><span class="cx"> coreChallenge.failureResponse().cfURLResponse(),
</span><span class="cx"> coreChallenge.error());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCredentialStorageCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp (171544 => 171545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp        2014-07-24 23:01:42 UTC (rev 171544)
+++ trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp        2014-07-24 23:01:43 UTC (rev 171545)
</span><span class="lines">@@ -47,7 +47,12 @@
</span><span class="cx">
</span><span class="cx"> Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& protectionSpace)
</span><span class="cx"> {
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFURLCredentialRef> credentialCF = adoptCF(wkCopyCredentialFromCFPersistentStorage(protectionSpace.cfSpace()));
</span><ins>+#else
+ RetainPtr<CFURLProtectionSpaceRef> protectionSpaceCF = adoptCF(createCF(protectionSpace));
+ RetainPtr<CFURLCredentialRef> credentialCF = adoptCF(wkCopyCredentialFromCFPersistentStorage(protectionSpaceCF.get()));
+#endif
</ins><span class="cx"> return core(credentialCF.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfProtectionSpaceCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ProtectionSpaceCFNet.cpp (171544 => 171545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ProtectionSpaceCFNet.cpp        2014-07-24 23:01:42 UTC (rev 171544)
+++ trunk/Source/WebCore/platform/network/cf/ProtectionSpaceCFNet.cpp        2014-07-24 23:01:43 UTC (rev 171545)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool ProtectionSpaceBase::receivesCredentialSecurely() const
</del><ins>+bool ProtectionSpace::receivesCredentialSecurely() const
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<CFURLProtectionSpaceRef> cfSpace = adoptCF(createCF(*this));
</span><span class="cx"> return cfSpace && CFURLProtectionSpaceReceivesCredentialSecurely(cfSpace.get());
</span></span></pre>
</div>
</div>
</body>
</html>