Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -61,6 +61,7 @@ namespace System.Web.Hosting {
private const string _clrQuirkAppSettingsAppContextPrefix = "AppContext.SetSwitch:";
private const string _regexMatchTimeoutKey = "REGEX_DEFAULT_MATCH_TIMEOUT";
private const string _configBuildersIgnoreLoadFailuresSwitch = "ConfigurationBuilders.IgnoreLoadFailure"; // Keep in sync with System.Configuration
private static readonly StrongName _mwiV1StrongName = GetMicrosoftWebInfrastructureV1StrongName();
private static Object _applicationManagerStaticLock = new Object();
@ -941,6 +942,8 @@ namespace System.Web.Hosting {
bool requireHostExecutionContextManager = false;
bool requireHostSecurityManager = false;
AppDomain.CurrentDomain.SetData(_configBuildersIgnoreLoadFailuresSwitch, true);
uncTokenConfig = appHost.GetConfigToken();
if (uncTokenConfig != IntPtr.Zero) {
ictxConfig = new ImpersonationContext(uncTokenConfig);