namespace System.Net.Http
{
- public class HttpClient : HttpMessageInvoker
+ public partial class HttpClient : HttpMessageInvoker
{
static readonly TimeSpan TimeoutDefault = TimeSpan.FromSeconds (100);
long buffer_size;
TimeSpan timeout;
+#if !XAMARIN_MODERN
public HttpClient ()
: this (new HttpClientHandler (), true)
{
}
+#endif
public HttpClient (HttpMessageHandler handler)
: this (handler, true)
return timeout;
}
set {
- if (value != System.Threading.Timeout.InfiniteTimeSpan && value < TimeSpan.Zero)
+ if (value != System.Threading.Timeout.InfiniteTimeSpan && (value <= TimeSpan.Zero || value.Ticks > int.MaxValue))
throw new ArgumentOutOfRangeException ();
timeout = value;
if (request.SetIsUsed ())
throw new InvalidOperationException ("Cannot send the same request message multiple times");
- if (request.RequestUri == null) {
+ var uri = request.RequestUri;
+ if (uri == null) {
if (base_address == null)
throw new InvalidOperationException ("The request URI must either be an absolute URI or BaseAddress must be set");
request.RequestUri = base_address;
- } else if (!request.RequestUri.IsAbsoluteUri) {
+ } else if (!uri.IsAbsoluteUri || uri.Scheme == Uri.UriSchemeFile && uri.OriginalString.StartsWith ("/", StringComparison.Ordinal)) {
if (base_address == null)
throw new InvalidOperationException ("The request URI must either be an absolute URI or BaseAddress must be set");
- request.RequestUri = new Uri (base_address, request.RequestUri);
+ request.RequestUri = new Uri (base_address, uri);
}
if (headers != null) {
public async Task<Stream> GetStreamAsync (string requestUri)
{
- var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false);
+ var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait (false);
resp.EnsureSuccessStatusCode ();
return await resp.Content.ReadAsStreamAsync ().ConfigureAwait (false);
}
public async Task<Stream> GetStreamAsync (Uri requestUri)
{
- var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseContentRead).ConfigureAwait (false);
+ var resp = await GetAsync (requestUri, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait (false);
resp.EnsureSuccessStatusCode ();
return await resp.Content.ReadAsStreamAsync ().ConfigureAwait (false);
}