mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
#19936: Fixing ignored urls in Orchard.OutputCache
Work Item: 19936 --HG-- branch : 1.x
This commit is contained in:
@@ -129,6 +129,7 @@ namespace Orchard.OutputCache.Filters {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// caches the default cache duration to prevent a query to the settings
|
// caches the default cache duration to prevent a query to the settings
|
||||||
_cacheDuration = _cacheManager.Get("CacheSettingsPart.Duration",
|
_cacheDuration = _cacheManager.Get("CacheSettingsPart.Duration",
|
||||||
context => {
|
context => {
|
||||||
@@ -171,13 +172,18 @@ namespace Orchard.OutputCache.Filters {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// caches the ignored urls to prevent a query to the settings
|
// caches the debug mode
|
||||||
_debugMode = _cacheManager.Get("CacheSettingsPart.DebugMode",
|
_debugMode = _cacheManager.Get("CacheSettingsPart.DebugMode",
|
||||||
context => {
|
context => {
|
||||||
context.Monitor(_signals.When(CacheSettingsPart.CacheKey));
|
context.Monitor(_signals.When(CacheSettingsPart.CacheKey));
|
||||||
return _workContext.CurrentSite.As<CacheSettingsPart>().DebugMode;
|
return _workContext.CurrentSite.As<CacheSettingsPart>().DebugMode;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// don't cache ignored url ?
|
||||||
|
if (IsIgnoredUrl(filterContext.RequestContext.HttpContext.Request.AppRelativeCurrentExecutionFilePath, _ignoredUrls)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var queryString = filterContext.RequestContext.HttpContext.Request.QueryString;
|
var queryString = filterContext.RequestContext.HttpContext.Request.QueryString;
|
||||||
var parameters = new Dictionary<string, object>(filterContext.ActionParameters);
|
var parameters = new Dictionary<string, object>(filterContext.ActionParameters);
|
||||||
@@ -351,11 +357,6 @@ namespace Orchard.OutputCache.Filters {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ignored url ?
|
|
||||||
if (IsIgnoredUrl(filterContext.RequestContext.HttpContext.Request.AppRelativeCurrentExecutionFilePath, _ignoredUrls)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// flush here to force the Filter to get the rendered content
|
// flush here to force the Filter to get the rendered content
|
||||||
if (response.IsClientConnected)
|
if (response.IsClientConnected)
|
||||||
response.Flush();
|
response.Flush();
|
||||||
@@ -368,7 +369,7 @@ namespace Orchard.OutputCache.Filters {
|
|||||||
|
|
||||||
response.Filter = null;
|
response.Filter = null;
|
||||||
response.Write(output);
|
response.Write(output);
|
||||||
|
|
||||||
// default duration of specific one ?
|
// default duration of specific one ?
|
||||||
var cacheDuration = configuration != null && configuration.Duration.HasValue ? configuration.Duration.Value : _cacheDuration;
|
var cacheDuration = configuration != null && configuration.Duration.HasValue ? configuration.Duration.Value : _cacheDuration;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user