properly respond to IfModifiedSince headers. should improve caching

pull/26/merge
kay.one 11 years ago
parent d339d1208f
commit 00c32cbb35

@ -3,14 +3,18 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using Nancy; using Nancy;
using Nancy.Responses; using Nancy.Responses;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Serializer; using NzbDrone.Common.Serializer;
namespace NzbDrone.Api.Extensions namespace NzbDrone.Api.Extensions
{ {
public static class JsonExtensions public static class ReqResExtensions
{ {
private static readonly NancyJsonSerializer NancySerializer = new NancyJsonSerializer(); private static readonly NancyJsonSerializer NancySerializer = new NancyJsonSerializer();
public static readonly string LastModified = BuildInfo.BuildDateTime.ToString("r");
public static T FromJson<T>(this Stream body) where T : class, new() public static T FromJson<T>(this Stream body) where T : class, new()
{ {
return FromJson<T>(body, typeof(T)); return FromJson<T>(body, typeof(T));
@ -51,7 +55,7 @@ namespace NzbDrone.Api.Extensions
{ {
headers["Cache-Control"] = "max-age=31536000 , public"; headers["Cache-Control"] = "max-age=31536000 , public";
headers["Expires"] = "Sat, 29 Jun 2020 00:00:00 GMT"; headers["Expires"] = "Sat, 29 Jun 2020 00:00:00 GMT";
headers["Last-Modified"] = "Sat, 29 Jun 2000 00:00:00 GMT"; headers["Last-Modified"] = LastModified;
headers["Age"] = "193266"; headers["Age"] = "193266";
return headers; return headers;

@ -48,6 +48,13 @@ namespace NzbDrone.Api.Frontend
return null; return null;
} }
if (context.Request.Headers.IfModifiedSince.HasValue)
{
var response = new Response { ContentType = MimeTypes.GetMimeType(path), StatusCode = HttpStatusCode.NotModified };
_addCacheHeaders.ToResponse(context.Request, response);
return response;
}
var mapper = _requestMappers.SingleOrDefault(m => m.CanHandle(path)); var mapper = _requestMappers.SingleOrDefault(m => m.CanHandle(path));
if (mapper != null) if (mapper != null)

Loading…
Cancel
Save