Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cache-headers' into develop

This commit is contained in:
kay.one 2013-08-10 12:59:05 -07:00
parent e9fdc6a575 00c32cbb35
commit 505c154fb6
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NzbDrone.Api/Extensions/ReqResExtensions.cs
View File

@ -3,14 +3,18 @@ using System.Collections.Generic;
using System.IO;
using Nancy;
using Nancy.Responses;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Serializer;
namespace NzbDrone.Api.Extensions
{
public static class JsonExtensions
public static class ReqResExtensions
{
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()
{
return FromJson<T>(body, typeof(T));
@ -51,7 +55,7 @@ namespace NzbDrone.Api.Extensions
{
headers["Cache-Control"] = "max-age=31536000 , public";
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";
return headers;

7
NzbDrone.Api/Frontend/StaticResourceProvider.cs
View File

@ -48,6 +48,13 @@ namespace NzbDrone.Api.Frontend
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));
if (mapper != null)