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

Re-introducing __r query parameter

Browse Source 
With an explanation this time
This commit is contained in:
Sebastien Ros
2014-05-12 15:32:25 -07:00
parent 97829e0948
commit bedbd10ef6
1 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ using Orchard.Services;
using Orchard.Themes;
using Orchard.UI.Admin;
using Orchard.Utility.Extensions;
using System.Collections.Specialized;
namespace Orchard.OutputCache.Filters {
public class OutputCacheFilter : FilterProvider, IActionFilter, IResultFilter {
@@ -37,6 +38,9 @@ namespace Orchard.OutputCache.Filters {
private readonly ICacheControlStrategy _cacheControlStrategy;
private Stream _previousFilter;
private static string RefreshKey = "__r";
private static long Epoch = new DateTime(2014, DateTimeKind.Utc).Ticks;
public OutputCacheFilter(
ICacheManager cacheManager,
IOutputCacheStorageProvider cacheStorageProvider,
@@ -151,12 +155,7 @@ namespace Orchard.OutputCache.Filters {
);
// caches the default max age duration to prevent a query to the settings
_maxAge = _cacheManager.Get("CacheSettingsPart.MaxAge",
context => {
context.Monitor(_signals.When(CacheSettingsPart.CacheKey));
return _workContext.CurrentSite.As<CacheSettingsPart>().DefaultMaxAge;
}
);
_maxAge = GetMaxAge();
_varyQueryStringParameters = _cacheManager.Get("CacheSettingsPart.VaryQueryStringParameters",
context => {
@@ -219,6 +218,11 @@ namespace Orchard.OutputCache.Filters {
foreach (var key in queryString.AllKeys) {
if (key == null) continue;
// ignore pages with the RefreshKey
if (String.Equals(RefreshKey, key, StringComparison.OrdinalIgnoreCase)) {
return;
}
parameters[key] = queryString[key];
}
@@ -448,14 +452,16 @@ namespace Orchard.OutputCache.Filters {
throw new ArgumentNullException();
}
var redirectResult = filterContext.Result as RedirectResult;
// 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)) {
if (redirectResult == null ||
!filterContext.HttpContext.Request.HttpMethod.Equals("POST", StringComparison.OrdinalIgnoreCase)) {
return false;
}
Logger.Debug("Redirect on POST");
var redirectUrl = ((RedirectResult)(filterContext.Result)).Url ;
var redirectUrl = redirectResult.Url ;
if (!VirtualPathUtility.IsAbsolute(redirectUrl)) {
var applicationRoot = new UrlHelper(filterContext.HttpContext.Request.RequestContext).MakeAbsolute("/");
@@ -476,7 +482,34 @@ namespace Orchard.OutputCache.Filters {
// remove all cached version of the same page
_cacheService.RemoveByTag(invariantCacheKey);
filterContext.Result = new RedirectResult(redirectUrl, ((RedirectResult) filterContext.Result).Permanent);
// adding a refresh key so that the redirection doesn't get restored
// from a cached version on a proxy
// this can happen when using public caching, we want to force the
// client to get a fresh copy of the redirectUrl page
if (GetMaxAge() > 0) {
var epIndex = redirectUrl.IndexOf('?');
var qs = new NameValueCollection();
if (epIndex > 0) {
qs = HttpUtility.ParseQueryString(redirectUrl.Substring(epIndex));
}
// substract Epoch to get a smaller number
var refresh = _now.Ticks - Epoch;
qs.Remove(RefreshKey);
qs.Add(RefreshKey, refresh.ToString("x"));
var querystring = "?" + string.Join("&", Array.ConvertAll(qs.AllKeys, k => string.Format("{0}={1}", HttpUtility.UrlEncode(k), HttpUtility.UrlEncode(qs[k]))));
if (epIndex > 0) {
redirectUrl = redirectUrl.Substring(0, epIndex) + querystring;
}
else {
redirectUrl = redirectUrl + querystring;
}
}
filterContext.Result = new RedirectResult(redirectUrl, redirectResult.Permanent);
filterContext.HttpContext.Response.Cache.SetCacheability(HttpCacheability.NoCache);
return true;
@@ -602,6 +635,14 @@ namespace Orchard.OutputCache.Filters {
return false;
}
private int GetMaxAge() {
return _cacheManager.Get("CacheSettingsPart.MaxAge",
context => {
context.Monitor(_signals.When(CacheSettingsPart.CacheKey));
return _workContext.CurrentSite.As<CacheSettingsPart>().DefaultMaxAge;
}
);
}
}
/// <summary>
@@ -676,6 +717,7 @@ namespace Orchard.OutputCache.Filters {
base.Dispose(disposing);
}
}
public class ViewDataContainer : IViewDataContainer {