lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source
This commit is contained in:
Sebastien Ros 2014-04-29 14:19:21 -07:00
commit 378f57601e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
View File

@ -228,11 +228,6 @@ namespace Orchard.OutputCache.Filters {
}
}
// don't enable public caching for requests with query string
if (queryString.AllKeys.Any()) {
_maxAge = 0;
}
// compute the cache key
_cacheKey = ComputeCacheKey(filterContext, parameters);
@ -489,6 +484,11 @@ namespace Orchard.OutputCache.Filters {
response.Cache.SetMaxAge(maxAge);
}
// keeping this examples for later usage
// response.Cache.VaryByParams["*"] = true;
// response.DisableUserCache();
// response.DisableKernelCache();
// an ETag is a string that uniquely identifies a specific version of a component.
// we use the cache item to detect if it's a new one
if (HttpRuntime.UsingIntegratedPipeline) {
@ -654,7 +654,11 @@ namespace Orchard.OutputCache.Filters {
}
protected override void Dispose(bool disposing) {
_mem.Dispose();
if (disposing) {
_mem.Dispose();
}
base.Dispose(disposing);
}
}

2
src/Orchard.Web/Web.config
View File

@ -99,9 +99,11 @@
<validation validateIntegratedModeConfiguration="false" />
<modules runAllManagedModulesForAllRequests="false">
<remove name="OutputCache" />
<remove name="WarmupHttpModule"/>
<add name="WarmupHttpModule" type="Orchard.WarmupStarter.WarmupHttpModule, Orchard.WarmupStarter, Version=1.8, Culture=neutral"/>
</modules>
<handlers accessPolicy="Script">
<!-- Clear all handlers, prevents executing code file extensions or returning any file contents. -->
<clear/>