Remove specific exception (#117756)

Author: ManickaP

src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs

@@ -2216,14 +2216,13 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
                     // WinHTTP validates the input before opening connection whereas SocketsHttpHandler opens connection first and validates only when writing to the wire.
                     acceptConnection.SetResult(!IsWinHttpHandler);
                     var ex = await Assert.ThrowsAnyAsync<Exception>(() => client.SendAsync(request));
+                    var hrex = Assert.IsType<HttpRequestException>(ex);
                     if (IsWinHttpHandler)
                     {
-                        var fex = Assert.IsType<FormatException>(ex);
-                        Assert.Contains("Latin-1", fex.Message);
+                        Assert.Contains("Error 87", hrex.InnerException.Message);
                     }
                     else
                     {
-                        var hrex = Assert.IsType<HttpRequestException>(ex);
                         var message = UseVersion == HttpVersion30 ? hrex.InnerException.Message : hrex.Message;
                         Assert.Contains("ASCII", message);
                     }

src/libraries/System.Net.Http.WinHttpHandler/src/Resources/Strings.resx

@@ -135,7 +135,4 @@
   <data name="net_http_unsupported_version" xml:space="preserve">
     <value>Request version value must be one of 1.0, 1.1, 2.0, or 3.0.</value>
   </data>
-  <data name="net_http_invalid_header_value" xml:space="preserve">
-    <value>Request headers must be valid Latin-1 characters.</value>
-  </data>
 </root>

src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpCookieContainerAdapter.cs

@@ -80,15 +80,7 @@ public static void ResetCookieRequestHeaders(WinHttpRequestState state, Uri redi
                     (uint)cookieHeader.Length,
                     Interop.WinHttp.WINHTTP_ADDREQ_FLAG_ADD))
                 {
-                    int lastError = Marshal.GetLastWin32Error();
-                    if (lastError == Interop.WinHttp.ERROR_INVALID_PARAMETER)
-                    {
-                        throw new FormatException(SR.net_http_invalid_header_value);
-                    }
-                    else
-                    {
-                        throw WinHttpException.CreateExceptionUsingError(lastError, nameof(Interop.WinHttp.WinHttpAddRequestHeaders));
-                    }
+                    throw WinHttpException.CreateExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpAddRequestHeaders));
                 }
             }
         }

src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs

@@ -769,15 +769,7 @@ private static void AddRequestHeaders(
                 (uint)requestHeadersBuffer.Length,
                 Interop.WinHttp.WINHTTP_ADDREQ_FLAG_ADD))
             {
-                int lastError = Marshal.GetLastWin32Error();
-                if (lastError == Interop.WinHttp.ERROR_INVALID_PARAMETER)
-                {
-                    throw new FormatException(SR.net_http_invalid_header_value);
-                }
-                else
-                {
-                    throw WinHttpException.CreateExceptionUsingError(lastError, nameof(Interop.WinHttp.WinHttpAddRequestHeaders));
-                }
+                throw WinHttpException.CreateExceptionUsingLastError(nameof(Interop.WinHttp.WinHttpAddRequestHeaders));
             }
         }