Address review feedback

dotnet · Jul 12, 2022 · 4dbe1c2 · 4dbe1c2
1 parent 73968ec
commit 4dbe1c2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.cs b/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.cs
@@ -43,12 +43,8 @@ internal ClientWebSocketOptions() { }
         public System.Net.Security.RemoteCertificateValidationCallback? RemoteCertificateValidationCallback { get { throw null; } set { } }
         [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
         public bool UseDefaultCredentials { get { throw null; } set { } }
-        public System.Version HttpVersion { get { throw null; }
-            [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
-            set { } }
-        public System.Net.Http.HttpVersionPolicy HttpVersionPolicy { get { throw null; }
-            [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
-            set { } }
+        public System.Version HttpVersion { get { throw null; } [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")] set { } }
+        public System.Net.Http.HttpVersionPolicy HttpVersionPolicy { get { throw null; } [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")] set { } }
         public void AddSubProtocol(string subProtocol) { }
         [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
         public void SetBuffer(int receiveBufferSize, int sendBufferSize) { }

diff --git a/...ibraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocketOptions.cs b/...ibraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/ClientWebSocketOptions.cs
@@ -29,6 +29,10 @@ public sealed class ClientWebSocketOptions
         private Version _version = Net.HttpVersion.Version11;
         private HttpVersionPolicy _versionPolicy = HttpVersionPolicy.RequestVersionOrLower;
 
+        internal ClientWebSocketOptions() { } // prevent external instantiation
+
+        #region HTTP Settings
+
         public Version HttpVersion
         {
             get => _version;
@@ -52,10 +56,6 @@ public HttpVersionPolicy HttpVersionPolicy
             }
         }
 
-        internal ClientWebSocketOptions() { } // prevent external instantiation
-
-        #region HTTP Settings
-
         [UnsupportedOSPlatform("browser")]
         // Note that some headers are restricted like Host.
         public void SetRequestHeader(string headerName, string? headerValue)

diff --git a/...braries/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Managed.cs b/...braries/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Managed.cs
@@ -112,7 +112,8 @@ public async Task ConnectAsync(Uri uri, HttpMessageInvoker? invoker, Cancellatio
                         break;
                     }
                     catch (HttpRequestException ex) when
-                        ((ex.Data.Contains("SETTINGS_ENABLE_CONNECT_PROTOCOL") || ex.Data.Contains("HTTP2_ENABLED") || tryDowngrade)
+                        ((ex.Data.Contains("SETTINGS_ENABLE_CONNECT_PROTOCOL") || ex.Data.Contains("HTTP2_ENABLED"))
+                        && tryDowngrade
                         && (options.HttpVersion == HttpVersion.Version11 || options.HttpVersionPolicy == HttpVersionPolicy.RequestVersionOrLower))
                     {
                     }