pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4028 from crobibero/cache-duration 

Properly verify cache duration
This commit is contained in:
Bond-009 2020-08-31 16:04:04 +02:00 committed by GitHub
parent 1f4deccfa4 db99903c35
commit 1b1de4026d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jellyfin.Api/Controllers/ImageController.cs
View File

@ -1281,9 +1281,9 @@ namespace Jellyfin.Api.Controllers
Response.Headers.Add(HeaderNames.LastModified, dateImageModified.ToUniversalTime().ToString("ddd, dd MMM yyyy HH:mm:ss \"GMT\"", new CultureInfo("en-US", false))); Response.Headers.Add(HeaderNames.LastModified, dateImageModified.ToUniversalTime().ToString("ddd, dd MMM yyyy HH:mm:ss \"GMT\"", new CultureInfo("en-US", false)));
// if the image was not modified since "ifModifiedSinceHeader"-header, return a HTTP status code 304 not modified // if the image was not modified since "ifModifiedSinceHeader"-header, return a HTTP status code 304 not modified
if (!(dateImageModified > ifModifiedSinceHeader)) if (!(dateImageModified > ifModifiedSinceHeader) && cacheDuration.HasValue)
{ {
if (ifModifiedSinceHeader.Add(cacheDuration!.Value) < DateTime.UtcNow) if (ifModifiedSinceHeader.Add(cacheDuration.Value) < DateTime.UtcNow)
{ {
Response.StatusCode = StatusCodes.Status304NotModified; Response.StatusCode = StatusCodes.Status304NotModified;
return new ContentResult(); return new ContentResult();