mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Fixing redirection support in OutputCache
This commit is contained in:
@@ -288,7 +288,8 @@ namespace Orchard.OutputCache.Filters {
|
||||
}
|
||||
|
||||
public void OnActionExecuted(ActionExecutedContext filterContext) {
|
||||
|
||||
// handle redirections
|
||||
TransformRedirect(filterContext);
|
||||
}
|
||||
|
||||
public void OnResultExecuted(ResultExecutedContext filterContext) {
|
||||
@@ -342,9 +343,6 @@ namespace Orchard.OutputCache.Filters {
|
||||
return;
|
||||
}
|
||||
|
||||
// handle redirections
|
||||
TransformRedirect(filterContext);
|
||||
|
||||
// save the result only if the content can be intercepted
|
||||
if (_filter == null) return;
|
||||
|
||||
@@ -407,13 +405,20 @@ namespace Orchard.OutputCache.Filters {
|
||||
|
||||
}
|
||||
|
||||
private void TransformRedirect(ResultExecutedContext filterContext) {
|
||||
// todo: look for RedirectToRoute to, or intercept 302s
|
||||
private bool TransformRedirect(ActionExecutedContext filterContext) {
|
||||
|
||||
if (filterContext.Result == null) {
|
||||
throw new ArgumentNullException();
|
||||
}
|
||||
|
||||
// status code can't be tested at this point, so test the result type instead
|
||||
if (!filterContext.HttpContext.Request.HttpMethod.Equals("POST", StringComparison.OrdinalIgnoreCase)
|
||||
|| !(filterContext.Result is RedirectResult)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (filterContext.HttpContext.Request.HttpMethod.Equals("POST", StringComparison.OrdinalIgnoreCase)
|
||||
&& filterContext.Result is RedirectResult) {
|
||||
Logger.Debug("Redirect on POST");
|
||||
var redirectUrl = ((RedirectResult) filterContext.Result).Url;
|
||||
var redirectUrl = ((RedirectResult)(filterContext.Result)).Url ;
|
||||
|
||||
if (!VirtualPathUtility.IsAbsolute(redirectUrl)) {
|
||||
var applicationRoot = filterContext.HttpContext.Request.ToRootUrlString();
|
||||
@@ -455,10 +460,12 @@ namespace Orchard.OutputCache.Filters {
|
||||
|
||||
filterContext.Result = new RedirectResult(redirectUrl, ((RedirectResult) filterContext.Result).Permanent);
|
||||
filterContext.HttpContext.Response.Cache.SetCacheability(HttpCacheability.NoCache);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public void OnResultExecuting(ResultExecutingContext filterContext) {
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
Reference in New Issue
Block a user