Merge branch 'andreatosato-master'

Author: TomPallister

docs/features/configuration.rst

@@ -25,6 +25,7 @@ Here is an example ReRoute configuration, You don't need to set all of these thi
                 "Get"
             ],
             "DownstreamHttpMethod": "",
+            "DownstreamHttpVersion": "",
             "AddHeadersToRequest": {},
             "AddClaimsToRequest": {},
             "RouteClaimsRequirement": {},
@@ -278,4 +279,9 @@ Registering a callback
         {
             _callbackHolder.Dispose();
         }
-    }
+    }
+
+DownstreamHttpVersion
+---------------------
+
+Ocelot allows you to choose the HTTP version it will use to make the proxy request. It can be set as "1.0", "1.1" or "2.0".

src/Ocelot/Configuration/Builder/DownstreamReRouteBuilder.cs

@@ -1,5 +1,6 @@
 using Ocelot.Configuration.Creator;
 using Ocelot.Values;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
@@ -42,6 +43,7 @@ public class DownstreamReRouteBuilder
         private bool _dangerousAcceptAnyServerCertificateValidator;
         private SecurityOptions _securityOptions;
         private string _downstreamHttpMethod;
+        private Version _downstreamHttpVersion;
 
         public DownstreamReRouteBuilder()
         {
@@ -255,6 +257,12 @@ public DownstreamReRouteBuilder WithSecurityOptions(SecurityOptions securityOpti
             return this;
         }
 
+        public DownstreamReRouteBuilder WithDownstreamHttpVersion(Version downstreamHttpVersion)
+        {
+            _downstreamHttpVersion = downstreamHttpVersion;
+            return this;
+        }
+
         public DownstreamReRoute Build()
         {
             return new DownstreamReRoute(
@@ -290,7 +298,8 @@ public DownstreamReRoute Build()
                 _addHeadersToUpstream,
                 _dangerousAcceptAnyServerCertificateValidator,
                 _securityOptions,
-                _downstreamHttpMethod);
+                _downstreamHttpMethod,
+                _downstreamHttpVersion);
         }
     }
 }

src/Ocelot/Configuration/Creator/ConfigurationCreator.cs

@@ -13,20 +13,23 @@ public class ConfigurationCreator : IConfigurationCreator
         private readonly IHttpHandlerOptionsCreator _httpHandlerOptionsCreator;
         private readonly IAdministrationPath _adminPath;
         private readonly ILoadBalancerOptionsCreator _loadBalancerOptionsCreator;
+        private readonly IVersionCreator _versionCreator;
 
         public ConfigurationCreator(
             IServiceProviderConfigurationCreator serviceProviderConfigCreator,
             IQoSOptionsCreator qosOptionsCreator,
             IHttpHandlerOptionsCreator httpHandlerOptionsCreator,
             IServiceProvider serviceProvider,
-            ILoadBalancerOptionsCreator loadBalancerOptionsCreator
+            ILoadBalancerOptionsCreator loadBalancerOptionsCreator,
+            IVersionCreator versionCreator
             )
         {
             _adminPath = serviceProvider.GetService<IAdministrationPath>();
             _loadBalancerOptionsCreator = loadBalancerOptionsCreator;
             _serviceProviderConfigCreator = serviceProviderConfigCreator;
             _qosOptionsCreator = qosOptionsCreator;
             _httpHandlerOptionsCreator = httpHandlerOptionsCreator;
+            _versionCreator = versionCreator;
         }
 
         public InternalConfiguration Create(FileConfiguration fileConfiguration, List<ReRoute> reRoutes)
@@ -41,14 +44,17 @@ public InternalConfiguration Create(FileConfiguration fileConfiguration, List<Re
 
             var adminPath = _adminPath != null ? _adminPath.Path : null;
 
+            var version = _versionCreator.Create(fileConfiguration.GlobalConfiguration.DownstreamHttpVersion);
+
             return new InternalConfiguration(reRoutes,
                 adminPath,
                 serviceProviderConfiguration,
                 fileConfiguration.GlobalConfiguration.RequestIdKey,
                 lbOptions,
                 fileConfiguration.GlobalConfiguration.DownstreamScheme,
                 qosOptions,
-                httpHandlerOptions
+                httpHandlerOptions,
+                version
                 );
         }
     }

src/Ocelot/Configuration/Creator/DynamicsCreator.cs

@@ -8,10 +8,12 @@ namespace Ocelot.Configuration.Creator
     public class DynamicsCreator : IDynamicsCreator
     {
         private readonly IRateLimitOptionsCreator _rateLimitOptionsCreator;
+        private readonly IVersionCreator _versionCreator;
 
-        public DynamicsCreator(IRateLimitOptionsCreator rateLimitOptionsCreator)
+        public DynamicsCreator(IRateLimitOptionsCreator rateLimitOptionsCreator, IVersionCreator versionCreator)
         {
             _rateLimitOptionsCreator = rateLimitOptionsCreator;
+            _versionCreator = versionCreator;
         }
 
         public List<ReRoute> Create(FileConfiguration fileConfiguration)
@@ -26,10 +28,13 @@ private ReRoute SetUpDynamicReRoute(FileDynamicReRoute fileDynamicReRoute, FileG
             var rateLimitOption = _rateLimitOptionsCreator
                 .Create(fileDynamicReRoute.RateLimitRule, globalConfiguration);
 
+            var version = _versionCreator.Create(fileDynamicReRoute.DownstreamHttpVersion);
+
             var downstreamReRoute = new DownstreamReRouteBuilder()
                 .WithEnableRateLimiting(rateLimitOption.EnableRateLimiting)
                 .WithRateLimitOptions(rateLimitOption)
                 .WithServiceName(fileDynamicReRoute.ServiceName)
+                .WithDownstreamHttpVersion(version)
                 .Build();
 
             var reRoute = new ReRouteBuilder()

src/Ocelot/Configuration/Creator/HttpVersionCreator.cs

@@ -0,0 +1,17 @@
+namespace Ocelot.Configuration.Creator
+{
+    using System;
+
+    public class HttpVersionCreator : IVersionCreator
+    {
+        public Version Create(string downstreamHttpVersion)
+        {
+            if (!Version.TryParse(downstreamHttpVersion, out Version version))
+            {
+                version = new Version(1, 1);
+            }
+
+            return version;
+        }
+    }
+}

src/Ocelot/Configuration/Creator/IVersionCreator.cs

@@ -0,0 +1,9 @@
+namespace Ocelot.Configuration.Creator
+{
+    using System;
+
+    public interface IVersionCreator
+    {
+        Version Create(string downstreamHttpVersion);
+    }
+}

src/Ocelot/Configuration/Creator/ReRoutesCreator.cs

@@ -22,6 +22,7 @@ public class ReRoutesCreator : IReRoutesCreator
         private readonly IDownstreamAddressesCreator _downstreamAddressesCreator;
         private readonly IReRouteKeyCreator _reRouteKeyCreator;
         private readonly ISecurityOptionsCreator _securityOptionsCreator;
+        private readonly IVersionCreator _versionCreator;
 
         public ReRoutesCreator(
             IClaimsToThingCreator claimsToThingCreator,
@@ -37,7 +38,8 @@ public ReRoutesCreator(
             IDownstreamAddressesCreator downstreamAddressesCreator,
             ILoadBalancerOptionsCreator loadBalancerOptionsCreator,
             IReRouteKeyCreator reRouteKeyCreator,
-            ISecurityOptionsCreator securityOptionsCreator
+            ISecurityOptionsCreator securityOptionsCreator,
+            IVersionCreator versionCreator
             )
         {
             _reRouteKeyCreator = reRouteKeyCreator;
@@ -55,6 +57,7 @@ ISecurityOptionsCreator securityOptionsCreator
             _httpHandlerOptionsCreator = httpHandlerOptionsCreator;
             _loadBalancerOptionsCreator = loadBalancerOptionsCreator;
             _securityOptionsCreator = securityOptionsCreator;
+            _versionCreator = versionCreator;
         }
 
         public List<ReRoute> Create(FileConfiguration fileConfiguration)
@@ -104,6 +107,8 @@ private DownstreamReRoute SetUpDownstreamReRoute(FileReRoute fileReRoute, FileGl
 
             var securityOptions = _securityOptionsCreator.Create(fileReRoute.SecurityOptions);
 
+            var downstreamHttpVersion = _versionCreator.Create(fileReRoute.DownstreamHttpVersion);
+
             var reRoute = new DownstreamReRouteBuilder()
                 .WithKey(fileReRoute.Key)
                 .WithDownstreamPathTemplate(fileReRoute.DownstreamPathTemplate)
@@ -138,6 +143,7 @@ private DownstreamReRoute SetUpDownstreamReRoute(FileReRoute fileReRoute, FileGl
                 .WithAddHeadersToUpstream(hAndRs.AddHeadersToUpstream)
                 .WithDangerousAcceptAnyServerCertificateValidator(fileReRoute.DangerousAcceptAnyServerCertificateValidator)
                 .WithSecurityOptions(securityOptions)
+                .WithDownstreamHttpVersion(downstreamHttpVersion)
                 .WithDownStreamHttpMethod(fileReRoute.DownstreamHttpMethod)
                 .Build();
 

src/Ocelot/Configuration/DownstreamReRoute.cs

@@ -1,6 +1,7 @@
 namespace Ocelot.Configuration
 {
     using Creator;
+    using System;
     using System.Collections.Generic;
     using Values;
 
@@ -39,7 +40,8 @@ public DownstreamReRoute(
             List<AddHeader> addHeadersToUpstream,
             bool dangerousAcceptAnyServerCertificateValidator,
             SecurityOptions securityOptions,
-            string downstreamHttpMethod)
+            string downstreamHttpMethod,
+            Version downstreamHttpVersion)
         {
             DangerousAcceptAnyServerCertificateValidator = dangerousAcceptAnyServerCertificateValidator;
             AddHeadersToDownstream = addHeadersToDownstream;
@@ -74,6 +76,7 @@ public DownstreamReRoute(
             AddHeadersToUpstream = addHeadersToUpstream;
             SecurityOptions = securityOptions;
             DownstreamHttpMethod = downstreamHttpMethod;
+            DownstreamHttpVersion = downstreamHttpVersion;
         }
 
         public string Key { get; }
@@ -109,5 +112,6 @@ public DownstreamReRoute(
         public bool DangerousAcceptAnyServerCertificateValidator { get; }
         public SecurityOptions SecurityOptions { get; }
         public string DownstreamHttpMethod { get; }
+        public Version DownstreamHttpVersion { get;  }
     }
 }

src/Ocelot/Configuration/File/FileDynamicReRoute.cs

@@ -4,5 +4,6 @@ public class FileDynamicReRoute
     {
         public string ServiceName { get; set; }
         public FileRateLimitRule RateLimitRule { get; set; }
+        public string DownstreamHttpVersion { get; set; }
     }
 }

src/Ocelot/Configuration/File/FileGlobalConfiguration.cs

@@ -26,5 +26,7 @@ public FileGlobalConfiguration()
         public string DownstreamScheme { get; set; }
 
         public FileHttpHandlerOptions HttpHandlerOptions { get; set; }
+
+        public string DownstreamHttpVersion { get; set; }
     }
 }