lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#19984: Output cache was not serving non ViewResult actions

Browse Source 
Work Item: 19984
This commit is contained in:
Sebastien Ros
2013-08-06 16:33:46 -07:00
parent ace100d40f
commit 378f764a83
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ using System.Text;
using System.Web; using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
using System.Web.Routing; using System.Web.Routing;
using Orchard.Core.Feeds.Rss;
using Orchard.OutputCache.Models; using Orchard.OutputCache.Models;
using Orchard.OutputCache.Services; using Orchard.OutputCache.Services;
using Orchard.Caching; using Orchard.Caching;
@@ -254,6 +255,11 @@ namespace Orchard.OutputCache.Filters {
public void OnActionExecuted(ActionExecutedContext filterContext) { public void OnActionExecuted(ActionExecutedContext filterContext) {
// only cache view results, but don't return already as we still need to process redirections
if (!(filterContext.Result is ViewResultBase) && !(filterContext.Result is RssResult)) {
_filter = null;
}
// ignore error results from cache // ignore error results from cache
if (filterContext.HttpContext.Response.StatusCode != (int)HttpStatusCode.OK) { if (filterContext.HttpContext.Response.StatusCode != (int)HttpStatusCode.OK) {
@@ -340,12 +346,6 @@ namespace Orchard.OutputCache.Filters {
// save the result only if the content can be intercepted // save the result only if the content can be intercepted
if (_filter == null) return; if (_filter == null) return;
// only for ViewResult right now, as we don't want to handle redirects, HttpNotFound, ...
if (filterContext.Result as ViewResultBase == null) {
Logger.Debug("Ignoring none ViewResult response");
return;
}
// check if there is a specific rule not to cache the whole route // check if there is a specific rule not to cache the whole route
var configurations = _cacheService.GetRouteConfigurations(); var configurations = _cacheService.GetRouteConfigurations();
var route = filterContext.Controller.ControllerContext.RouteData.Route; var route = filterContext.Controller.ControllerContext.RouteData.Route;