Imported Upstream version 6.4.0.183

Former-commit-id: 85d93be5537556349ef364365576dccf5d99b797
2019-08-28 08:43:56 +00:00
parent f94a1d9416
commit d213358eb3
49 changed files with 53 additions and 46 deletions
--- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs
+++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs
@@ -666,8 +666,12 @@ namespace System.Net.Http
            }
            else
            {
+#if MONO
+                if (!request.RequestUri.IsAbsoluteUri || request.RequestUri.Scheme == Uri.UriSchemeFile && request.RequestUri.OriginalString.StartsWith ("/", StringComparison.Ordinal))
+#else
                // If the request Uri is an absolute Uri, just use it. Otherwise try to combine it with the base Uri.
                if (!request.RequestUri.IsAbsoluteUri)
+#endif
                {
                    if (_baseAddress == null)
                    {