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

@ -46,6 +46,35 @@ namespace System.Web.Configuration
return provider;
}
[AspNetHostingPermission(SecurityAction.Demand, Level = AspNetHostingPermissionLevel.Low)]
internal static ProviderBase InstantiateProvider(NameValueCollection providerSettings, Type providerType) {
ProviderBase provider = null;
try {
string pnName = GetAndRemoveStringValue(providerSettings, "name");
string pnType = GetAndRemoveStringValue(providerSettings, "type");
if (string.IsNullOrEmpty(pnType))
throw new ArgumentException(SR.GetString(SR.Provider_no_type_name));
Type t = ConfigUtil.GetType(pnType, "type", null, null, true, true);
if (!providerType.IsAssignableFrom(t))
throw new ArgumentException(SR.GetString(SR.Provider_must_implement_type, providerType.ToString()));
provider = (ProviderBase)HttpRuntime.CreatePublicInstance(t);
// Because providers modify the parameters collection (i.e. delete stuff), pass in a clone of the collection
NameValueCollection cloneParams = new NameValueCollection(providerSettings.Count, StringComparer.Ordinal);
foreach (string key in providerSettings)
cloneParams[key] = providerSettings[key];
provider.Initialize(pnName, cloneParams);
}
catch (Exception e) {
if (e is ConfigurationException)
throw;
throw new ConfigurationErrorsException(e.Message, e);
}
return provider;
}
[AspNetHostingPermission(SecurityAction.Demand, Level = AspNetHostingPermissionLevel.Low)]
public static void InstantiateProviders(ProviderSettingsCollection configProviders, ProviderCollection providers, Type providerType)
{
@ -53,5 +82,13 @@ namespace System.Web.Configuration
providers.Add(InstantiateProvider(ps, providerType));
}
}
private static string GetAndRemoveStringValue(NameValueCollection collection, string key) {
string strValue = collection[key] as string;
if (!string.IsNullOrEmpty(strValue))
strValue = strValue.Trim();
collection.Remove(key);
return strValue;
}
}
}