Add Protocol Required Option

Author: liveans

src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs

@@ -162,6 +162,7 @@ internal static partial class WinHttp
         public const uint WINHTTP_PROTOCOL_FLAG_HTTP3 = 0x2;
         public const uint WINHTTP_HTTP2_PLUS_CLIENT_CERT_FLAG = 0x1;
         public const uint WINHTTP_OPTION_DISABLE_STREAM_QUEUE = 139;
+        public const uint WINHTTP_OPTION_HTTP_PROTOCOL_REQUIRED = 145;
 
         public const uint WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET = 114;
         public const uint WINHTTP_OPTION_WEB_SOCKET_CLOSE_TIMEOUT = 115;

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

@@ -904,6 +904,14 @@ private async Task StartRequestAsync(WinHttpRequestState state)
                 {
                     httpVersion = "HTTP/1.1";
                 }
+                else if (state.RequestMessage.Version == HttpVersion20)
+                {
+                    httpVersion = "HTTP/2.0";
+                }
+                else if (state.RequestMessage.Version == HttpVersion30)
+                {
+                    httpVersion = "HTTP/3.0";
+                }
 
                 OpenRequestHandle(state, connectHandle, httpVersion, out WinHttpChunkMode chunkedModeForSend, out SafeWinHttpHandle requestHandle);
                 state.RequestHandle = requestHandle;
@@ -1269,7 +1277,7 @@ private void SetRequestHandleOptions(WinHttpRequestState state)
             SetRequestHandleClientCertificateOptions(state.RequestHandle, state.RequestMessage.RequestUri);
             SetRequestHandleCredentialsOptions(state);
             SetRequestHandleBufferingOptions(state.RequestHandle);
-            SetRequestHandleHttpProtocolOptions(state.RequestHandle, state.RequestMessage.Version);
+            SetRequestHandleHttpProtocolOptions(state.RequestHandle, state.RequestMessage.Version, state.RequestMessage.VersionPolicy == HttpVersionPolicy.RequestVersionExact);
         }
 
         private static void SetRequestHandleProxyOptions(WinHttpRequestState state)
@@ -1509,7 +1517,7 @@ private void SetRequestHandleBufferingOptions(SafeWinHttpHandle requestHandle)
             SetWinHttpOption(requestHandle, Interop.WinHttp.WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE, ref optionData);
         }
 
-        private void SetRequestHandleHttpProtocolOptions(SafeWinHttpHandle requestHandle, Version requestVersion)
+        private void SetRequestHandleHttpProtocolOptions(SafeWinHttpHandle requestHandle, Version requestVersion, bool required)
         {
             Debug.Assert(requestHandle != null);
             uint optionData = (requestVersion == HttpVersion30) ? Interop.WinHttp.WINHTTP_PROTOCOL_FLAG_HTTP3 :
@@ -1524,6 +1532,19 @@ private void SetRequestHandleHttpProtocolOptions(SafeWinHttpHandle requestHandle
             else
             {
                 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, $"HTTP/{requestVersion.Major} option not supported");
+                return;
+            }
+
+            if (required && requestVersion >= HttpVersion20)
+            {
+                uint protocolRequired = 1;
+                if (!Interop.WinHttp.WinHttpSetOption(
+                    requestHandle,
+                    Interop.WinHttp.WINHTTP_OPTION_HTTP_PROTOCOL_REQUIRED,
+                    ref protocolRequired))
+                {
+                    if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, "HTTP protocol required option not supported");
+                }
             }
         }