Title: [256406] branches/safari-609-branch/Tools
- Revision
- 256406
- Author
- alanc...@apple.com
- Date
- 2020-02-11 16:59:48 -0800 (Tue, 11 Feb 2020)
Log Message
Cherry-pick r255880. rdar://problem/59299151
Unreviewed, another build fix after r255846
* TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255880 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Tools/ChangeLog (256405 => 256406)
--- branches/safari-609-branch/Tools/ChangeLog 2020-02-12 00:59:46 UTC (rev 256405)
+++ branches/safari-609-branch/Tools/ChangeLog 2020-02-12 00:59:48 UTC (rev 256406)
@@ -1,5 +1,21 @@
2020-02-11 Alan Coon <alanc...@apple.com>
+ Cherry-pick r255880. rdar://problem/59299151
+
+ Unreviewed, another build fix after r255846
+
+ * TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255880 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-02-05 Chris Dumez <cdu...@apple.com>
+
+ Unreviewed, another build fix after r255846
+
+ * TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:
+
+2020-02-11 Alan Coon <alanc...@apple.com>
+
Cherry-pick r255846. rdar://problem/59299151
Make WKWebView._negotiatedLegacyTLS accurate when loading main resouorce from network or cache
Modified: branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm (256405 => 256406)
--- branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm 2020-02-12 00:59:46 UTC (rev 256405)
+++ branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm 2020-02-12 00:59:48 UTC (rev 256406)
@@ -245,7 +245,7 @@
#endif // HAVE(TLS_PROTOCOL_VERSION_T) || HAVE(NETWORK_FRAMEWORK)
-#if HAVE(TLS_PROTOCOL_VERSION_T)
+#if HAVE(NETWORK_FRAMEWORK) && HAVE(TLS_PROTOCOL_VERSION_T)
TEST(TLSVersion, NegotiatedLegacyTLS)
{
@@ -275,10 +275,6 @@
[webView removeObserver:observer.get() forKeyPath:@"_negotiatedLegacyTLS"];
}
-#endif // HAVE(TLS_PROTOCOL_VERSION_T)
-
-#if HAVE(NETWORK_FRAMEWORK) && HAVE(TLS_PROTOCOL_VERSION_T)
-
TEST(TLSVersion, NavigateBack)
{
HTTPServer legacyTLSServer({
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
