Merge pull request #2784 from rajansingh10/mfeature

Enabled max redirection in HTTP xplat

Author: rajansingh10

src/Common/src/Interop/Unix/libcurl/Interop.libcurl_types.cs

@@ -31,6 +31,7 @@ internal static partial class CURLoption
             internal const int CURLOPT_UPLOAD = CurlOptionLongBase + 46;
             internal const int CURLOPT_FOLLOWLOCATION = CurlOptionLongBase + 52;
             internal const int CURLOPT_PROXYPORT = CurlOptionLongBase + 59;
+            internal const int CURLOPT_MAXREDIRS = CurlOptionLongBase + 68;
             internal const int CURLOPT_PROXYTYPE = CurlOptionLongBase + 101;
 
             internal const int CURLOPT_WRITEDATA = CurlOptionObjectPointBase + 1;

src/System.Net.Http/src/System/Net/Http/Unix/CurlHandler.cs

@@ -43,7 +43,6 @@ internal partial class CurlHandler : HttpMessageHandler
 
         private volatile bool _anyOperationStarted;
         private volatile bool _disposed;
-        private bool _automaticRedirection = true;
         private IWebProxy _proxy = null;
         private ICredentials _serverCredentials = null;
         private ProxyUsePolicy _proxyPolicy = ProxyUsePolicy.UseDefaultProxy;
@@ -52,6 +51,8 @@ internal partial class CurlHandler : HttpMessageHandler
         private GCHandle _multiHandlePtr = new GCHandle();
         private CookieContainer _cookieContainer = null;
         private bool _useCookie = false;
+        private bool _automaticRedirection = true;
+        private int _maxAutomaticRedirections = 50;
 
         #endregion        
 
@@ -104,6 +105,7 @@ internal bool UseProxy
             {
                 return _proxyPolicy != ProxyUsePolicy.DoNotUseProxy;
             }
+
             set
             {
                 CheckDisposedOrStarted();
@@ -124,6 +126,7 @@ internal IWebProxy Proxy
             {
                 return _proxy;
             }
+
             set
             {
                 CheckDisposedOrStarted();
@@ -137,6 +140,7 @@ internal ICredentials Credentials
             {
                 return _serverCredentials;
             }
+
             set
             {
                 CheckDisposedOrStarted();
@@ -150,6 +154,7 @@ internal ClientCertificateOption ClientCertificateOptions
             {
                 return ClientCertificateOption.Manual;
             }
+
             set
             {
                 if (ClientCertificateOption.Manual != value)
@@ -173,6 +178,7 @@ internal DecompressionMethods AutomaticDecompression
             {
                 return _automaticDecompression;
             }
+
             set
             {
                 CheckDisposedOrStarted();
@@ -208,6 +214,28 @@ internal CookieContainer CookieContainer
             }
         }
 
+        internal int MaxAutomaticRedirections
+        {
+            get
+            {
+                return _maxAutomaticRedirections;
+            }
+
+            set
+            {
+                if (value <= 0)
+                {
+                    throw new ArgumentOutOfRangeException(
+                        "value",
+                        value,
+                        string.Format(SR.net_http_value_must_be_greater_than, 0));
+                }
+
+                CheckDisposedOrStarted();
+                _maxAutomaticRedirections = value;
+            }
+        }
+
         #endregion
 
         protected override void Dispose(bool disposing)
@@ -381,6 +409,9 @@ private SafeCurlHandle CreateRequestHandle(RequestCompletionSource state, GCHand
             if (_automaticRedirection)
             {
                 SetCurlOption(requestHandle, CURLoption.CURLOPT_FOLLOWLOCATION, 1L);
+                
+                // Set maximum automatic redirection option
+                SetCurlOption(requestHandle, CURLoption.CURLOPT_MAXREDIRS, _maxAutomaticRedirections);
             }
             if (state.RequestMessage.Content != null)
             {

src/System.Net.Http/src/System/Net/Http/Unix/HttpClientHandler.Unix.cs

@@ -57,6 +57,7 @@ public ClientCertificateOption ClientCertificateOptions
             {
                 return _curlHandler.ClientCertificateOptions;
             }
+
             set
             {
                 _curlHandler.ClientCertificateOptions = value;
@@ -105,6 +106,7 @@ public bool AllowAutoRedirect
             {
                 return _curlHandler.AutomaticRedirection;
             }
+
             set
             {
                 _curlHandler.AutomaticRedirection = value;
@@ -113,8 +115,15 @@ public bool AllowAutoRedirect
 
         public int MaxAutomaticRedirections
         {
-            get { throw NotImplemented.ByDesignWithMessage("HTTP stack not implemented"); }
-            set { throw NotImplemented.ByDesignWithMessage("HTTP stack not implemented"); }
+            get
+            {
+                return _curlHandler.MaxAutomaticRedirections;
+            }
+
+            set
+            {
+                _curlHandler.MaxAutomaticRedirections = value;
+            }
         }
 
         public long MaxRequestContentBufferSize