Merge pull request #601 from knocte/sock_improvements

[mono.git] / mcs / class / System.Net.Http / System.Net.Http / HttpClientHandler.cs

diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
index 718af53401725eced2ea626ccf2752692cd247e3..68004b990133bdb3f1956725e540b8fcc320f63c 100644 (file)
--- a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
@@ -40,28 +40,38 @@ namespace System.Net.Http
                CookieContainer cookieContainer;
                ICredentials credentials;
                int maxAutomaticRedirections;
-               int maxRequestContentBufferSize;
+               long maxRequestContentBufferSize;
                bool preAuthenticate;
                IWebProxy proxy;
                bool useCookies;
                bool useDefaultCredentials;
                bool useProxy;
                ClientCertificateOption certificate;
+               bool sentRequest;
 
                public HttpClientHandler ()
                {
                        allowAutoRedirect = true;
                        maxAutomaticRedirections = 50;
-                       maxRequestContentBufferSize = 0x10000;
+                       maxRequestContentBufferSize = int.MaxValue;
                        useCookies = true;
                        useProxy = true;
                }
 
+               void EnsureModifiability ()
+               {
+                       if (sentRequest)
+                               throw new InvalidOperationException (
+                                       "This instance has already started one or more requests. " +
+                                       "Properties can only be modified before sending the first request.");
+               }
+
                public bool AllowAutoRedirect {
                        get {
                                return allowAutoRedirect;
                        }
                        set {
+                               EnsureModifiability ();
                                allowAutoRedirect = value;
                        }
                }
@@ -71,6 +81,7 @@ namespace System.Net.Http
                                return automaticDecompression;
                        }
                        set {
+                               EnsureModifiability ();
                                automaticDecompression = value;
                        }
                }
@@ -80,6 +91,7 @@ namespace System.Net.Http
                                return certificate;
                        }
                        set {
+                               EnsureModifiability ();
                                certificate = value;
                        }
                }
@@ -89,6 +101,7 @@ namespace System.Net.Http
                                return cookieContainer ?? (cookieContainer = new CookieContainer ());
                        }
                        set {
+                               EnsureModifiability ();
                                cookieContainer = value;
                        }
                }
@@ -98,6 +111,7 @@ namespace System.Net.Http
                                return credentials;
                        }
                        set {
+                               EnsureModifiability ();
                                credentials = value;
                        }
                }
@@ -107,6 +121,7 @@ namespace System.Net.Http
                                return maxAutomaticRedirections;
                        }
                        set {
+                               EnsureModifiability ();
                                if (value <= 0)
                                        throw new ArgumentOutOfRangeException ();
 
@@ -114,11 +129,12 @@ namespace System.Net.Http
                        }
                }
 
-               public int MaxRequestContentBufferSize {
+               public long MaxRequestContentBufferSize {
                        get {
                                return maxRequestContentBufferSize;
                        }
                        set {
+                               EnsureModifiability ();
                                if (value < 0)
                                        throw new ArgumentOutOfRangeException ();
 
@@ -131,6 +147,7 @@ namespace System.Net.Http
                                return preAuthenticate;
                        }
                        set {
+                               EnsureModifiability ();
                                preAuthenticate = value;
                        }
                }
@@ -140,6 +157,7 @@ namespace System.Net.Http
                                return proxy;
                        }
                        set {
+                               EnsureModifiability ();
                                if (!UseProxy)
                                        throw new InvalidOperationException ();
 
@@ -170,6 +188,7 @@ namespace System.Net.Http
                                return useCookies;
                        }
                        set {
+                               EnsureModifiability ();
                                useCookies = value;
                        }
                }
@@ -179,6 +198,7 @@ namespace System.Net.Http
                                return useDefaultCredentials;
                        }
                        set {
+                               EnsureModifiability ();
                                useDefaultCredentials = value;
                        }
                }
@@ -188,6 +208,7 @@ namespace System.Net.Http
                                return useProxy;
                        }
                        set {
+                               EnsureModifiability ();
                                useProxy = value;
                        }
                }
@@ -218,6 +239,8 @@ namespace System.Net.Http
                        if (allowAutoRedirect) {
                                wr.AllowAutoRedirect = true;
                                wr.MaximumAutomaticRedirections = maxAutomaticRedirections;
+                       } else {
+                               wr.AllowAutoRedirect = false;
                        }
 
                        wr.AutomaticDecompression = automaticDecompression;
@@ -260,10 +283,13 @@ namespace System.Net.Http
                                var key = headers.GetKey(i);
                                var value = headers.GetValues (i);
 
+                               HttpHeaders item_headers;
                                if (HttpHeaders.GetKnownHeaderKind (key) == Headers.HttpHeaderKind.Content)
-                                       response.Content.Headers.AddWithoutValidation (key, value);
+                                       item_headers = response.Content.Headers;
                                else
-                                       response.Headers.AddWithoutValidation (key, value);
+                                       item_headers = response.Headers;
+                                       
+                               item_headers.TryAddWithoutValidation (key, value);
                        }
 
                        return response;
@@ -271,6 +297,7 @@ namespace System.Net.Http
 
                protected async internal override Task<HttpResponseMessage> SendAsync (HttpRequestMessage request, CancellationToken cancellationToken)
                {
+                       sentRequest = true;
                        var wrequest = CreateWebRequest (request);
 
                        if (request.Content != null) {
@@ -280,9 +307,9 @@ namespace System.Net.Http
                                                headers.AddValue (header.Key, value);
                                        }
                                }
-                               
-                               var stream = wrequest.GetRequestStream ();
-                               await request.Content.CopyToAsync (stream);
+
+                               var stream = await wrequest.GetRequestStreamAsync ().ConfigureAwait (false);
+                               await request.Content.CopyToAsync (stream).ConfigureAwait (false);
                        }
 
                        // FIXME: GetResponseAsync does not accept cancellationToken