Title: [152518] branches/safari-537-branch/Source/WebCore
- Revision
- 152518
- Author
- [email protected]
- Date
- 2013-07-09 15:08:53 -0700 (Tue, 09 Jul 2013)
Log Message
Merged r152514. <rdar://problem/14391944>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152517 => 152518)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 22:06:36 UTC (rev 152517)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 22:08:53 UTC (rev 152518)
@@ -1,5 +1,20 @@
2013-07-09 Lucas Forschler <[email protected]>
+ Merge r152514
+
+ 2013-07-09 Jeff Miller <[email protected]>
+
+ AuthenticationMac.mm does not handle NSURLAuthenticationMethodNegotiate in WebCore::mac()
+ https://bugs.webkit.org/show_bug.cgi?id=118518
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/network/mac/AuthenticationMac.mm:
+ (WebCore::mac):
+ Map ProtectionSpaceAuthenticationSchemeNegotiate to NSURLAuthenticationMethodNegotiate.
+
+2013-07-09 Lucas Forschler <[email protected]>
+
Merge r152513
2013-07-09 Jeff Miller <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/platform/network/mac/AuthenticationMac.mm (152517 => 152518)
--- branches/safari-537-branch/Source/WebCore/platform/network/mac/AuthenticationMac.mm 2013-07-09 22:06:36 UTC (rev 152517)
+++ branches/safari-537-branch/Source/WebCore/platform/network/mac/AuthenticationMac.mm 2013-07-09 22:08:53 UTC (rev 152518)
@@ -283,6 +283,9 @@
case ProtectionSpaceAuthenticationSchemeNTLM:
method = NSURLAuthenticationMethodNTLM;
break;
+ case ProtectionSpaceAuthenticationSchemeNegotiate:
+ method = NSURLAuthenticationMethodNegotiate;
+ break;
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
case ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
method = NSURLAuthenticationMethodServerTrust;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
