Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -15,12 +15,15 @@ namespace System.ServiceModel
internal const string HttpTransportPerFactoryConnectionPoolString = "wcf:httpTransportBinding:useUniqueConnectionPoolPerFactory";
internal const string EnsureUniquePerformanceCounterInstanceNamesString = "wcf:ensureUniquePerformanceCounterInstanceNames";
internal const string UseConfiguredTransportSecurityHeaderLayoutString = "wcf:useConfiguredTransportSecurityHeaderLayout";
internal const string UseBestMatchNamedPipeUriString = "wcf:useBestMatchNamedPipeUri";
const bool DefaultHttpTransportPerFactoryConnectionPool = false;
const bool DefaultEnsureUniquePerformanceCounterInstanceNames = false;
const bool DefaultUseConfiguredTransportSecurityHeaderLayout = false;
const bool DefaultUseBestMatchNamedPipeUri = false;
static bool httpTransportPerFactoryConnectionPool;
static bool ensureUniquePerformanceCounterInstanceNames;
static bool useConfiguredTransportSecurityHeaderLayout;
static bool useBestMatchNamedPipeUri;
static volatile bool settingsInitalized = false;
static object appSettingsLock = new object();
@ -54,6 +57,16 @@ namespace System.ServiceModel
}
}
internal static bool UseBestMatchNamedPipeUri
{
get
{
EnsureSettingsLoaded();
return useBestMatchNamedPipeUri;
}
}
[SuppressMessage(FxCop.Category.ReliabilityBasic, "Reliability104:CaughtAndHandledExceptionsRule",
Justification = "Handle the configuration exceptions here to avoid regressions on customer's existing scenarios")]
static void EnsureSettingsLoaded()
@ -89,6 +102,11 @@ namespace System.ServiceModel
useConfiguredTransportSecurityHeaderLayout = DefaultUseConfiguredTransportSecurityHeaderLayout;
}
if ((appSettingsSection == null) || !bool.TryParse(appSettingsSection[UseBestMatchNamedPipeUriString], out useBestMatchNamedPipeUri))
{
useBestMatchNamedPipeUri = DefaultUseBestMatchNamedPipeUri;
}
settingsInitalized = true;
}
}