Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@@ -391,7 +391,7 @@ namespace System.Net.Http
values = values.Where (l => l != "chunked");
}
var values_formated = HeaderUtils.GetSingleHeaderString (header.Key, values);
var values_formated = PlatformHelper.GetSingleHeaderString (header.Key, values);
if (values_formated == null)
continue;
@@ -406,11 +406,7 @@ namespace System.Net.Http
var response = new HttpResponseMessage (wr.StatusCode);
response.RequestMessage = requestMessage;
response.ReasonPhrase = wr.StatusDescription;
#if LEGACY_HTTPCLIENT
response.Content = new StreamContent (wr.GetResponseStream (), cancellationToken);
#else
response.Content = new StreamContent (wr.GetResponseStream ());
#endif
response.Content = PlatformHelper.CreateStreamContent (wr.GetResponseStream (), cancellationToken);
var headers = wr.Headers;
for (int i = 0; i < headers.Count; ++i) {
@@ -418,7 +414,7 @@ namespace System.Net.Http
var value = headers.GetValues (i);
HttpHeaders item_headers;
if (HeaderUtils.IsContentHeader (key))
if (PlatformHelper.IsContentHeader (key))
item_headers = response.Content.Headers;
else
item_headers = response.Headers;