Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -50,20 +50,12 @@ namespace System.Web.Caching
Dictionary <string, string> keysCache;
Dictionary <string, string> entriesToInvalidate;
#if !NET_4_0
OutputCacheProvider provider;
internal OutputCacheProvider InternalProvider {
get { return provider; }
}
#endif
public OutputCacheModule ()
{
}
OutputCacheProvider FindCacheProvider (HttpApplication app)
{
#if NET_4_0
HttpContext ctx = HttpContext.Current;
if (app == null) {
app = ctx != null ? ctx.ApplicationInstance : null;
@ -81,12 +73,6 @@ namespace System.Web.Caching
throw new ProviderException (String.Format ("OutputCacheProvider named '{0}' cannot be found.", providerName));
return ret;
#else
if (provider == null)
provider = new InMemoryOutputCacheProvider ();
return provider;
#endif
}
public void Dispose ()