Changeset 280879 in webkit

Timestamp:

Aug 10, 2021, 6:51:25 PM (5 years ago)

Author:

timothy_horton@apple.com

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.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-10  Tim Horton  <timothy_horton@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  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -164 +164 @@
 static String stringForTLSProtocolVersion(tls_protocol_version_t protocol)
 {
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     switch (protocol) {
     case tls_protocol_version_TLSv10:
@@ -178 +179 @@
         return "DTLS 1.2"_s;
     }
+ALLOW_DEPRECATED_DECLARATIONS_END
     return { };
 }
@@ -711 +713 @@
         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
@@ -936 +940 @@
         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