mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.10.0.72

Browse Source 
Former-commit-id: 938ba563c6675baa1eb6b639367dda3872c4ffad
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-02-13 08:55:09 +00:00
parent ec7bc58245
commit bf76f2910e
103 changed files with 544 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mcs/class/System.Net.Http/HttpClientHandler.SocketsHandler.Android.cs Normal file
View File

@@ -0,0 +1,20 @@
namespace System.Net.Http
{
partial class HttpClientHandler : HttpMessageHandler
{
static IMonoHttpClientHandler CreateDefaultHandler ()
{
string envvar = Environment.GetEnvironmentVariable ("XA_HTTP_CLIENT_HANDLER_TYPE")?.Trim ();
if (envvar?.StartsWith("System.Net.Http.MonoWebRequestHandler", StringComparison.InvariantCulture) == true)
return new MonoWebRequestHandler ();
// Ignore other types of handlers here (e.g. AndroidHttpHandler) to keep the old behavior
// and always create SocketsHttpHandler for code like this if MonoWebRequestHandler was not specified:
//
// var handler = new HttpClientHandler { Credentials = ... };
// var httpClient = new HttpClient (handler);
//
// AndroidHttpHandler is used only when we use the parameterless ctor of HttpClient
return new SocketsHttpHandler ();
}
}
}

35
mcs/class/System.Net.Http/System.Net.Http/HttpClient.android.cs
View File

@@ -8,22 +8,31 @@ namespace System.Net.Http {
static HttpMessageHandler CreateDefaultHandler ()
{
Type type = Type.GetType("Android.Runtime.AndroidEnvironment, Mono.Android");
if (type == null)
return GetFallback ("Invalid Mono.Android assembly? Cannot find Android.Runtime.AndroidEnvironment");
string envvar = Environment.GetEnvironmentVariable ("XA_HTTP_CLIENT_HANDLER_TYPE")?.Trim ();
MethodInfo method = type.GetMethod ("GetHttpMessageHandler", BindingFlags.Static | BindingFlags.NonPublic);
if (method == null)
return GetFallback ("Your Xamarin.Android version does not support obtaining of the custom HttpClientHandler");
if (string.IsNullOrEmpty (envvar))
return GetFallback ($"XA_HTTP_CLIENT_HANDLER_TYPE is empty");
object ret = method.Invoke (null, null);
if (ret == null)
return GetFallback ("Xamarin.Android returned no custom HttpClientHandler");
if (envvar?.StartsWith("System.Net.Http.MonoWebRequestHandler", StringComparison.InvariantCulture) == true)
return new HttpClientHandler (new MonoWebRequestHandler ());
var handler = ret as HttpMessageHandler;
if (handler == null)
return GetFallback ($"{ret?.GetType()} is not a valid HttpMessageHandler");
return handler;
Type handlerType = Type.GetType (envvar, false);
if (handlerType == null && !envvar.Contains (", "))
{
// if assembly was not specified - look for it in Mono.Android too
// (e.g. AndroidHttpHandler is there)
handlerType = Type.GetType (envvar + ", Mono.Android", false);
}
if (handlerType == null)
return GetFallback ($"'{envvar}' type was not found");
object handlerObj = Activator.CreateInstance (handlerType);
if (handlerObj is HttpMessageHandler msgHandler)
return msgHandler;
return GetFallback ($"{handlerObj?.GetType ()} is not a valid HttpMessageHandler or MonoWebRequestHandler");
}
static HttpMessageHandler GetFallback (string message)

1
mcs/class/System.Net.Http/UnitTests/monodroid_System.Net.Http.UnitTests_xtest.dll.sources
View File

@@ -1 +1,2 @@
#include unit-tests.sources
HttpClientHandlerTests.Android.cs

1
mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.exclude.sources
View File

@@ -1 +1,2 @@
HttpClient.DefaultHandler.cs
HttpClientHandler.SocketsHandler.cs

1
mcs/class/System.Net.Http/monodroid_System.Net.Http.dll.sources
View File

@@ -1,2 +1,3 @@
#include socketshandler.sources
System.Net.Http/HttpClient.android.cs
HttpClientHandler.SocketsHandler.Android.cs