Title: [280879] trunk/Source/WebKit
- Revision
- 280879
- Author
- timothy_hor...@apple.com
- Date
- 2021-08-10 18:51:25 -0700 (Tue, 10 Aug 2021)
Log Message
Unreviewed build fix.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(stringForTLSProtocolVersion):
(-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
Ignore some slightly less unconventional deprecation warnings.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (280878 => 280879)
--- trunk/Source/WebKit/ChangeLog 2021-08-11 01:34:53 UTC (rev 280878)
+++ trunk/Source/WebKit/ChangeLog 2021-08-11 01:51:25 UTC (rev 280879)
@@ -1,3 +1,13 @@
+2021-08-10 Tim Horton <timothy_hor...@apple.com>
+
+ Unreviewed build fix.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (stringForTLSProtocolVersion):
+ (-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
+ Ignore some slightly less unconventional deprecation warnings.
+
2021-08-10 Alex Christensen <achristen...@webkit.org>
WebKitBlobResource error 1 exactly after 60 seconds when trying to read file input
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (280878 => 280879)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-08-11 01:34:53 UTC (rev 280878)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-08-11 01:51:25 UTC (rev 280879)
@@ -163,6 +163,7 @@
#if HAVE(CFNETWORK_METRICS_APIS_V4)
static String stringForTLSProtocolVersion(tls_protocol_version_t protocol)
{
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
switch (protocol) {
case tls_protocol_version_TLSv10:
return "TLS 1.0"_s;
@@ -177,6 +178,7 @@
case tls_protocol_version_DTLSv12:
return "DTLS 1.2"_s;
}
+ALLOW_DEPRECATED_DECLARATIONS_END
return { };
}
@@ -710,8 +712,10 @@
#if HAVE(TLS_PROTOCOL_VERSION_T)
NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject;
auto tlsVersion = (tls_protocol_version_t)metrics.negotiatedTLSProtocolVersion.unsignedShortValue;
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (tlsVersion == tls_protocol_version_TLSv10 || tlsVersion == tls_protocol_version_TLSv11)
negotiatedLegacyTLS = NegotiatedLegacyTLS::Yes;
+ALLOW_DEPRECATED_DECLARATIONS_END
#endif
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (negotiatedLegacyTLS == NegotiatedLegacyTLS::No && [task respondsToSelector:@selector(_TLSNegotiatedProtocolVersion)]) {
@@ -935,8 +939,10 @@
#if HAVE(TLS_PROTOCOL_VERSION_T)
NSURLSessionTaskTransactionMetrics *metrics = taskMetrics.transactionMetrics.lastObject;
auto tlsVersion = (tls_protocol_version_t)metrics.negotiatedTLSProtocolVersion.unsignedShortValue;
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (tlsVersion == tls_protocol_version_TLSv10 || tlsVersion == tls_protocol_version_TLSv11)
negotiatedLegacyTLS = NegotiatedLegacyTLS::Yes;
+ALLOW_DEPRECATED_DECLARATIONS_END
#else // We do not need to check _TLSNegotiatedProtocolVersion if we have metrics.negotiatedTLSProtocolVersion because it works at response time even before rdar://problem/56522601
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if ([dataTask respondsToSelector:@selector(_TLSNegotiatedProtocolVersion)]) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
