From: Geoff Kizer <geoffrek>
Date: Wed, 10 Jul 2019 00:17:58 +0000 (-0700)
Subject: disable version check on platforms that don't support ALPN
X-Git-Tag: submit/tizen/20210909.063632~11031^2~907^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb2fa10f05e6e1a00ec245bb0d6f578dc797fd3a;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

disable version check on platforms that don't support ALPN


Commit migrated from https://github.com/dotnet/corefx/commit/c11af5504d806fd02874457d80db2e92b072385e
---

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.cs
index 1ccef58..d1c5b2a 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.cs
@@ -127,10 +127,14 @@ namespace System.Net.Http.Functional.Tests
 
         protected HttpClient CreateHttpClientForRemoteServer(Configuration.Http.RemoteServer remoteServer, HttpClientHandler httpClientHandler)
         {
+            HttpMessageHandler wrappedHandler = httpClientHandler;
+
             // ActiveIssue #39293: WinHttpHandler will downgrade to 1.1 if you set Transfer-Encoding: chunked.
             // So, skip this verification if we're not using SocketsHttpHandler.
-            HttpMessageHandler wrappedHandler =
-                IsSocketsHttpHandler(httpClientHandler) ? new VersionCheckerHttpHandler(httpClientHandler, remoteServer.HttpVersion) : (HttpMessageHandler)httpClientHandler;
+            if (PlatformDetection.SupportsAlpn && IsSocketsHttpHandler(httpClientHandler))
+            {
+                wrappedHandler = new VersionCheckerHttpHandler(httpClientHandler, remoteServer.HttpVersion);
+            }
 
             var client = new HttpClient(wrappedHandler);
             SetDefaultRequestVersion(client, remoteServer.HttpVersion);