Merge branch 'upstream'
Former-commit-id: c732d62b178873a25a58da4ed6cb58315387fb0d
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
b37058d62d
@ -1 +1 @@
|
||||
3eda38237ba0fa60c8a78bf0e98159a0d5fc6b2b
|
||||
1cea1d05066e6a469398b6bae53fd1a5d68f04d8
|
||||
@ -1 +1 @@
|
||||
fd82432b012de483588e1a0457cb907c683db2cf
|
||||
b85acafcc9b1971e02a188b9176aa05a4db7235c
|
||||
716
external/bdwgc/autom4te.cache/requests
vendored
716
external/bdwgc/autom4te.cache/requests
vendored
File diff suppressed because it is too large
Load Diff
8
external/bdwgc/config.log
vendored
8
external/bdwgc/config.log
vendored
@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69. Invocation command line was
|
||||
## Platform. ##
|
||||
## --------- ##
|
||||
|
||||
hostname = az-ubuntu-general969d81
|
||||
hostname = az-ubuntu-general6409e0
|
||||
uname -m = x86_64
|
||||
uname -r = 4.15.0-1069-azure
|
||||
uname -r = 4.15.0-1071-azure
|
||||
uname -s = Linux
|
||||
uname -v = #74-Ubuntu SMP Fri Feb 7 17:22:24 UTC 2020
|
||||
uname -v = #76-Ubuntu SMP Wed Feb 12 03:02:44 UTC 2020
|
||||
|
||||
/usr/bin/uname -p = unknown
|
||||
/bin/uname -X = unknown
|
||||
@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
|
||||
CONFIG_COMMANDS =
|
||||
$ ./config.status
|
||||
|
||||
on az-ubuntu-general969d81
|
||||
on az-ubuntu-general6409e0
|
||||
|
||||
config.status:1238: creating Makefile
|
||||
config.status:1238: creating bdw-gc.pc
|
||||
|
||||
2
external/bdwgc/libtool.REMOVED.git-id
vendored
2
external/bdwgc/libtool.REMOVED.git-id
vendored
@ -1 +1 @@
|
||||
a5a0b34dd01a21b3074699aff3bb0fe01d62049d
|
||||
1382ae0e7830b14ab9473ff485d3e70f5df8cc52
|
||||
@ -1496,6 +1496,9 @@ scanning is available.
|
||||
\fBno-managed-allocator\fR
|
||||
Disables the managed allocator.
|
||||
.TP
|
||||
\fBmanaged-allocator\fR
|
||||
Enables the managed allocator.
|
||||
.TP
|
||||
\fBcheck-scan-starts\fR
|
||||
If set, does a plausibility check on the scan_starts before and after each collection
|
||||
.TP
|
||||
@ -1521,7 +1524,10 @@ sgen-gc.c. You can then use this command to explore the output
|
||||
\fBnursery-canaries\fR
|
||||
If set, objects allocated in the nursery are suffixed with a canary (guard)
|
||||
word, which is checked on each minor collection. Can be used to detect/debug
|
||||
heap corruption issues.
|
||||
heap corruption issues. This disables the usage of the managed allocator,
|
||||
because allocation from full aot code is inconsistent with this option. If
|
||||
the application is guaranteed not to use aot code, the managed allocator can
|
||||
be enabled back with managed-allocator option.
|
||||
|
||||
.TP
|
||||
\fBdo-not-finalize(=\fIclasses\fB)\fR
|
||||
|
||||
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.10.0.79";
|
||||
public const string MonoVersion = "6.10.0.81";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -12,7 +12,6 @@ System.Net.Http/MultipartContentTest.cs
|
||||
System.Net.Http/MultipartFormDataContentTest.cs
|
||||
System.Net.Http/StreamContentTest.cs
|
||||
System.Net.Http/StringContentTest.cs
|
||||
System.Net.Http/HttpClientHandlerTests.Android.cs
|
||||
System.Net.Http.Headers/AuthenticationHeaderValueTest.cs
|
||||
System.Net.Http.Headers/CacheControlHeaderValueTest.cs
|
||||
System.Net.Http.Headers/ContentDispositionHeaderValueTest.cs
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
using System.Text;
|
||||
using System.Net.Http;
|
||||
using System.Reflection;
|
||||
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace System.Net.Http.Tests
|
||||
{
|
||||
[TestFixture]
|
||||
public class HttpClientHandlerTestsAndroid
|
||||
{
|
||||
static Type GetInnerHandlerType (HttpClient httpClient)
|
||||
{
|
||||
BindingFlags bflasgs = BindingFlags.Instance | BindingFlags.NonPublic;
|
||||
FieldInfo handlerField = typeof (HttpMessageInvoker).GetField("_handler", bflasgs);
|
||||
Assert.IsNotNull (handlerField);
|
||||
object handler = handlerField.GetValue (httpClient);
|
||||
FieldInfo innerHandlerField = handler.GetType ().GetField ("_delegatingHandler", bflasgs);
|
||||
Assert.IsNotNull (handlerField);
|
||||
object innerHandler = innerHandlerField.GetValue (handler);
|
||||
return innerHandler.GetType ();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestEnvVarSwitchForInnerHttpHandler ()
|
||||
{
|
||||
#if !MONODROID
|
||||
return;
|
||||
#endif
|
||||
const string xaHandlerKey = "XA_HTTP_CLIENT_HANDLER_TYPE";
|
||||
var prevHandler = Environment.GetEnvironmentVariable (xaHandlerKey);
|
||||
|
||||
// ""
|
||||
Environment.SetEnvironmentVariable (xaHandlerKey, "");
|
||||
var httpClient1 = new HttpClient ();
|
||||
Assert.AreEqual ("SocketsHttpHandler", GetInnerHandlerType (httpClient1).Name);
|
||||
|
||||
var handler2 = new HttpClientHandler ();
|
||||
var httpClient2 = new HttpClient (handler2);
|
||||
Assert.AreEqual ("SocketsHttpHandler", GetInnerHandlerType (httpClient2).Name);
|
||||
|
||||
// "System.Net.Http.MonoWebRequestHandler"
|
||||
Environment.SetEnvironmentVariable (xaHandlerKey, "System.Net.Http.MonoWebRequestHandler");
|
||||
var httpClient3 = new HttpClient ();
|
||||
Assert.AreEqual ("MonoWebRequestHandler", GetInnerHandlerType (httpClient3).Name);
|
||||
|
||||
var handler4 = new HttpClientHandler ();
|
||||
var httpClient4 = new HttpClient (handler4);
|
||||
Assert.AreEqual ("MonoWebRequestHandler", GetInnerHandlerType (httpClient4).Name);
|
||||
|
||||
// "System.Net.Http.MonoWebRequestHandler, System.Net.Http"
|
||||
Environment.SetEnvironmentVariable (xaHandlerKey, "System.Net.Http.MonoWebRequestHandler, System.Net.Http");
|
||||
var httpClient5 = new HttpClient ();
|
||||
Assert.AreEqual ("MonoWebRequestHandler", GetInnerHandlerType (httpClient5).Name);
|
||||
|
||||
var handler6 = new HttpClientHandler ();
|
||||
var httpClient6 = new HttpClient (handler6);
|
||||
Assert.AreEqual ("MonoWebRequestHandler", GetInnerHandlerType (httpClient6).Name);
|
||||
|
||||
// "System.Net.Http.HttpClientHandler"
|
||||
Environment.SetEnvironmentVariable (xaHandlerKey, "System.Net.Http.HttpClientHandler");
|
||||
var httpClient7 = new HttpClient ();
|
||||
Assert.AreEqual ("SocketsHttpHandler", GetInnerHandlerType (httpClient7).Name);
|
||||
|
||||
var handler8 = new HttpClientHandler ();
|
||||
var httpClient8 = new HttpClient (handler8);
|
||||
Assert.AreEqual ("SocketsHttpHandler", GetInnerHandlerType (httpClient8).Name);
|
||||
|
||||
Environment.SetEnvironmentVariable (xaHandlerKey, prevHandler);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1 +1 @@
|
||||
3509912d9ece3ffae8892338a8b7d191c341adc6
|
||||
86a5dc7bbfde66f1134a85038dbabe8cd733439c
|
||||
@ -1 +1 @@
|
||||
bacfce6b6d0b818bee67aa94d64011711db4afad
|
||||
2e1b48014ca314985ce155e8f876a6e901c1556e
|
||||
@ -1 +1 @@
|
||||
4d827fe16b2e39ca49d37b3fa31a0beb67b1d33e
|
||||
3b82d95b59ebf52c6554b1bcf92a29136dd39cd1
|
||||
@ -1 +1 @@
|
||||
7c73b167752924894980e0e60ec17b4070f5811d
|
||||
93e5919993bbcc0895bd4e59d9a0badf4127bff3
|
||||
@ -1 +1 @@
|
||||
8fb3cddafa32e3a592e72145b6c91b77e84caf68
|
||||
1fa644386f932ba40b652ee17dbd412358be7fbf
|
||||
@ -1 +1 @@
|
||||
778527c6ed97b3c2795c2d498d45e71370ff6e90
|
||||
22b26dde137a49e1be80d8ca4a39816c7ed2472f
|
||||
@ -1 +1 @@
|
||||
07f957cf41ba1d5f3fd5b74febdb5b444ecf9d4b
|
||||
bdb7f1ebb9107c01e5d438bc71368a4204cab6f7
|
||||
@ -1 +1 @@
|
||||
31cfb941c91f3a839d4cc187031da8a0b1aa205e
|
||||
43b10719f4952ab0860e15700e87725fed617349
|
||||
@ -1 +1 @@
|
||||
3509912d9ece3ffae8892338a8b7d191c341adc6
|
||||
86a5dc7bbfde66f1134a85038dbabe8cd733439c
|
||||
@ -1 +1 @@
|
||||
bacfce6b6d0b818bee67aa94d64011711db4afad
|
||||
2e1b48014ca314985ce155e8f876a6e901c1556e
|
||||
@ -1 +1 @@
|
||||
4d827fe16b2e39ca49d37b3fa31a0beb67b1d33e
|
||||
3b82d95b59ebf52c6554b1bcf92a29136dd39cd1
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user