Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -16,14 +16,17 @@ namespace System.ServiceModel
internal const string EnsureUniquePerformanceCounterInstanceNamesString = "wcf:ensureUniquePerformanceCounterInstanceNames";
internal const string UseConfiguredTransportSecurityHeaderLayoutString = "wcf:useConfiguredTransportSecurityHeaderLayout";
internal const string UseBestMatchNamedPipeUriString = "wcf:useBestMatchNamedPipeUri";
internal const string DisableOperationContextAsyncFlowString = "wcf:disableOperationContextAsyncFlow";
const bool DefaultHttpTransportPerFactoryConnectionPool = false;
const bool DefaultEnsureUniquePerformanceCounterInstanceNames = false;
const bool DefaultUseConfiguredTransportSecurityHeaderLayout = false;
const bool DefaultUseBestMatchNamedPipeUri = false;
const bool DefaultDisableOperationContextAsyncFlow = true;
static bool httpTransportPerFactoryConnectionPool;
static bool ensureUniquePerformanceCounterInstanceNames;
static bool useConfiguredTransportSecurityHeaderLayout;
static bool useBestMatchNamedPipeUri;
static bool disableOperationContextAsyncFlow;
static volatile bool settingsInitalized = false;
static object appSettingsLock = new object();
@ -47,6 +50,15 @@ namespace System.ServiceModel
}
}
internal static bool DisableOperationContextAsyncFlow
{
get
{
EnsureSettingsLoaded();
return disableOperationContextAsyncFlow;
}
}
internal static bool UseConfiguredTransportSecurityHeaderLayout
{
get
@ -97,6 +109,11 @@ namespace System.ServiceModel
ensureUniquePerformanceCounterInstanceNames = DefaultEnsureUniquePerformanceCounterInstanceNames;
}
if ((appSettingsSection == null) || !bool.TryParse(appSettingsSection[DisableOperationContextAsyncFlowString], out disableOperationContextAsyncFlow))
{
disableOperationContextAsyncFlow = DefaultDisableOperationContextAsyncFlow;
}
if ((appSettingsSection == null) || !bool.TryParse(appSettingsSection[UseConfiguredTransportSecurityHeaderLayoutString], out useConfiguredTransportSecurityHeaderLayout))
{
useConfiguredTransportSecurityHeaderLayout = DefaultUseConfiguredTransportSecurityHeaderLayout;