Merge branch '1.8.x' into 1.x

This commit is contained in:
Sebastien Ros
2014-05-26 17:37:43 -07:00

View File

@@ -487,10 +487,12 @@ namespace Orchard.OutputCache.Filters {
response.Cache.SetMaxAge(maxAge);
}
response.Cache.VaryByParams["*"] = true;
response.DisableUserCache();
// keeping this examples for later usage
// response.Cache.VaryByParams["*"] = true;
// response.DisableUserCache();
// response.DisableKernelCache();
// response.Cache.SetOmitVaryStar(true);
// 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
@@ -500,8 +502,6 @@ namespace Orchard.OutputCache.Filters {
}
}
response.Cache.SetOmitVaryStar(true);
if (_varyQueryStringParameters != null) {
foreach (var queryStringParam in _varyQueryStringParameters) {
response.Cache.VaryByParams[queryStringParam] = true;