revert workarounds for 39372

Commit migrated from https://github.com/dotnet/corefx/commit/0aea825037c13e522bec6f6bc21df37720a1b414

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.cs
index 4caf5b1..cc1b33b 100644 (file)
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ServerCertificates.cs
@@ -223,12 +223,6 @@ namespace System.Net.Http.Functional.Tests
                 return;
             }
 
-            if (!PlatformDetection.IsWindows && remoteServer.HttpVersion == new Version(2, 0))
-            {
-                // ActiveIssue #39372: Certificate validation is asserting against the remote HTTP2 server on Linux
-                return;
-            }
-
             HttpClientHandler handler = CreateHttpClientHandler();
             using (HttpClient client = CreateHttpClientForRemoteServer(remoteServer, handler))
             {

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.cs
index 75bb5fd..fba216d 100644 (file)
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.cs
@@ -122,12 +122,6 @@ namespace System.Net.Http.Functional.Tests
 
         protected HttpClient CreateHttpClientForRemoteServer(Configuration.Http.RemoteServer remoteServer, HttpClientHandler httpClientHandler)
         {
-            if (!PlatformDetection.IsWindows && remoteServer.HttpVersion == new Version(2, 0))
-            {
-                // ActiveIssue #39372: Certificate validation is asserting against the remote HTTP2 server on Linux
-                httpClientHandler.ServerCertificateCustomValidationCallback = TestHelper.AllowAllCertificates;
-            }
-
             HttpMessageHandler wrappedHandler = httpClientHandler;
 
             // ActiveIssue #39293: WinHttpHandler will downgrade to 1.1 if you set Transfer-Encoding: chunked.