Title: [152517] branches/safari-537-branch/Source/WebCore
- Revision
- 152517
- Author
- [email protected]
- Date
- 2013-07-09 15:06:36 -0700 (Tue, 09 Jul 2013)
Log Message
Merged r152513. <rdar://problem/14391944>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152516 => 152517)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 21:55:14 UTC (rev 152516)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 22:06:36 UTC (rev 152517)
@@ -1,5 +1,20 @@
2013-07-09 Lucas Forschler <[email protected]>
+ Merge r152513
+
+ 2013-07-09 Jeff Miller <[email protected]>
+
+ AuthenticationMac.mm does not handle NSURLAuthenticationMethodNegotiate
+ https://bugs.webkit.org/show_bug.cgi?id=118517
+
+ Reviewed by Brady Eidson.
+
+ * platform/network/mac/AuthenticationMac.mm:
+ (WebCore::core):
+ Map "NSURLAuthenticationMethodNegotiate" to ProtectionSpaceAuthenticationSchemeNegotiate.
+
+2013-07-09 Lucas Forschler <[email protected]>
+
Merge r152494
2013-07-09 Mark Lam <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/platform/network/mac/AuthenticationMac.mm (152516 => 152517)
--- branches/safari-537-branch/Source/WebCore/platform/network/mac/AuthenticationMac.mm 2013-07-09 21:55:14 UTC (rev 152516)
+++ branches/safari-537-branch/Source/WebCore/platform/network/mac/AuthenticationMac.mm 2013-07-09 22:06:36 UTC (rev 152517)
@@ -389,6 +389,8 @@
scheme = ProtectionSpaceAuthenticationSchemeHTMLForm;
else if ([method isEqualToString:NSURLAuthenticationMethodNTLM])
scheme = ProtectionSpaceAuthenticationSchemeNTLM;
+ else if ([method isEqualToString:NSURLAuthenticationMethodNegotiate])
+ scheme = ProtectionSpaceAuthenticationSchemeNegotiate;
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
else if ([method isEqualToString:NSURLAuthenticationMethodClientCertificate])
scheme = ProtectionSpaceAuthenticationSchemeClientCertificateRequested;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
