Add DecompressionEnabled property and wire up changing HttpClientHand…

…ler behavior (#4745)
dotnet · Oct 18, 2021 · f2a3ffb · f2a3ffb
1 parent 74dbe9b
commit f2a3ffb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/HttpChannelFactory.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/HttpChannelFactory.cs
@@ -96,6 +96,7 @@ internal HttpChannelFactory(HttpTransportBindingElement bindingElement, BindingC
             }
 
             AuthenticationScheme = bindingElement.AuthenticationScheme;
+            DecompressionEnabled = bindingElement.DecompressionEnabled;
             MaxBufferSize = bindingElement.MaxBufferSize;
             TransferMode = bindingElement.TransferMode;
             _keepAliveEnabled = bindingElement.KeepAliveEnabled;
@@ -142,6 +143,8 @@ internal HttpChannelFactory(HttpTransportBindingElement bindingElement, BindingC
 
         public AuthenticationSchemes AuthenticationScheme { get; }
 
+        public bool DecompressionEnabled { get; }
+
         public virtual bool IsChannelBindingSupportEnabled
         {
             get
@@ -283,7 +286,14 @@ internal async Task<HttpClient> GetHttpClientAsync(EndpointAddress to, Uri via,
             if (!foundHttpClient)
             {
                 var clientHandler = GetHttpClientHandler(to, clientCertificateToken);
-                clientHandler.AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip;
+                if (DecompressionEnabled)
+                {
+                    clientHandler.AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip;
+                }
+                else
+                {
+                    clientHandler.AutomaticDecompression = DecompressionMethods.None;
+                }
 
                 if (clientHandler.SupportsProxy)
                 {

diff --git a/...stem.Private.ServiceModel/src/System/ServiceModel/Channels/HttpTransportBindingElement.cs b/...stem.Private.ServiceModel/src/System/ServiceModel/Channels/HttpTransportBindingElement.cs
@@ -16,7 +16,6 @@ namespace System.ServiceModel.Channels
     public class HttpTransportBindingElement
         : TransportBindingElement
     {
-        private bool _decompressionEnabled;
         private HostNameComparisonMode _hostNameComparisonMode;
         private bool _inheritBaseAddressSettings;
         private int _maxBufferSize;
@@ -38,7 +37,7 @@ public HttpTransportBindingElement()
             AllowCookies = HttpTransportDefaults.AllowCookies;
             AuthenticationScheme = HttpTransportDefaults.AuthenticationScheme;
             BypassProxyOnLocal = HttpTransportDefaults.BypassProxyOnLocal;
-            _decompressionEnabled = HttpTransportDefaults.DecompressionEnabled;
+            DecompressionEnabled = HttpTransportDefaults.DecompressionEnabled;
             _hostNameComparisonMode = HttpTransportDefaults.HostNameComparisonMode;
             KeepAliveEnabled = HttpTransportDefaults.KeepAliveEnabled;
             _maxBufferSize = TransportDefaults.MaxBufferSize;
@@ -61,7 +60,7 @@ protected HttpTransportBindingElement(HttpTransportBindingElement elementToBeClo
             AllowCookies = elementToBeCloned.AllowCookies;
             AuthenticationScheme = elementToBeCloned.AuthenticationScheme;
             BypassProxyOnLocal = elementToBeCloned.BypassProxyOnLocal;
-            _decompressionEnabled = elementToBeCloned._decompressionEnabled;
+            DecompressionEnabled = elementToBeCloned.DecompressionEnabled;
             _hostNameComparisonMode = elementToBeCloned._hostNameComparisonMode;
             _inheritBaseAddressSettings = elementToBeCloned.InheritBaseAddressSettings;
             KeepAliveEnabled = elementToBeCloned.KeepAliveEnabled;
@@ -92,17 +91,7 @@ protected HttpTransportBindingElement(HttpTransportBindingElement elementToBeClo
         public bool BypassProxyOnLocal { get; set; }
 
         [DefaultValue(HttpTransportDefaults.DecompressionEnabled)]
-        public bool DecompressionEnabled
-        {
-            get
-            {
-                return _decompressionEnabled;
-            }
-            set
-            {
-                _decompressionEnabled = value;
-            }
-        }
+        public bool DecompressionEnabled { get; set; }
 
         [DefaultValue(HttpTransportDefaults.HostNameComparisonMode)]
         public HostNameComparisonMode HostNameComparisonMode
@@ -497,7 +486,7 @@ internal override bool IsMatch(BindingElement b)
                 return false;
             }
 
-            if (_decompressionEnabled != http._decompressionEnabled)
+            if (DecompressionEnabled != http.DecompressionEnabled)
             {
                 return false;
             }

diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/TransportDefaults.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/TransportDefaults.cs
@@ -261,7 +261,7 @@ internal static class HttpTransportDefaults
         internal const bool DecompressionEnabled = true;
         internal const HostNameComparisonMode HostNameComparisonMode = System.ServiceModel.HostNameComparisonMode.StrongWildcard;
         internal const bool KeepAliveEnabled = true;
-        internal const IWebProxy Proxy = null; 
+        internal const IWebProxy Proxy = null;
         internal const Uri ProxyAddress = null;
         internal const AuthenticationSchemes ProxyAuthenticationScheme = AuthenticationSchemes.Anonymous;
         internal const string Realm = "";

diff --git a/src/System.ServiceModel.Http/ref/System.ServiceModel.Http.cs b/src/System.ServiceModel.Http/ref/System.ServiceModel.Http.cs
@@ -123,7 +123,7 @@ public NetHttpBinding(string configurationName) { }
         [System.ComponentModel.DefaultValueAttribute((System.ServiceModel.NetHttpMessageEncoding)(0))]
         public System.ServiceModel.NetHttpMessageEncoding MessageEncoding { get { return default; } set { } }
         public System.ServiceModel.BasicHttpSecurity Security { get { return default; } set { } }
-        public System.ServiceModel.OptionalReliableSession ReliableSession { get; set; }
+        public System.ServiceModel.OptionalReliableSession ReliableSession { get { return default; } set { } }
         public System.ServiceModel.Channels.WebSocketTransportSettings WebSocketSettings { get { return default; } }
         public override System.ServiceModel.Channels.IChannelFactory<TChannel> BuildChannelFactory<TChannel>(System.ServiceModel.Channels.BindingParameterCollection parameters) { return default; }
         public override System.ServiceModel.Channels.BindingElementCollection CreateBindingElements() { return default; }
@@ -136,7 +136,7 @@ public NetHttpsBinding(System.ServiceModel.BasicHttpsSecurityMode securityMode,
         [System.ComponentModel.DefaultValueAttribute((System.ServiceModel.NetHttpMessageEncoding)(0))]
         public System.ServiceModel.NetHttpMessageEncoding MessageEncoding { get { return default; } set { } }
         public System.ServiceModel.BasicHttpsSecurity Security { get { return default; } set { } }
-        public System.ServiceModel.OptionalReliableSession ReliableSession { get; set; }
+        public System.ServiceModel.OptionalReliableSession ReliableSession { get { return default; } set { } }
         public System.ServiceModel.Channels.WebSocketTransportSettings WebSocketSettings { get { return default; } }
         public override System.ServiceModel.Channels.IChannelFactory<TChannel> BuildChannelFactory<TChannel>(System.ServiceModel.Channels.BindingParameterCollection parameters) { return default; }
         public override System.ServiceModel.Channels.BindingElementCollection CreateBindingElements() { return default; }
@@ -255,7 +255,9 @@ protected HttpTransportBindingElement(System.ServiceModel.Channels.HttpTransport
         public System.Net.AuthenticationSchemes AuthenticationScheme { get { return default; } set { } }
         [System.ComponentModel.DefaultValue(false)]
         public bool BypassProxyOnLocal { get { return default; } set { } }
-        public System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy ExtendedProtectionPolicy { get; set; }
+        [System.ComponentModel.DefaultValue(true)]
+        public bool DecompressionEnabled { get { return default; } set { } }
+        public System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy ExtendedProtectionPolicy { get { return default; } set { } }
         [System.ComponentModel.DefaultValueAttribute(65536)]
         public int MaxBufferSize { get { return default; } set { } }
         [System.ComponentModel.DefaultValue(null)]