diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-08-31 16:04:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 16:04:04 +0200 |
| commit | 1b1de4026d849fff03cb794bc653d268813e2083 (patch) | |
| tree | 8934d627f494917f03c164a60a7a0cf0b5f505c6 /Jellyfin.Api/Controllers/ImageController.cs | |
| parent | 1f4deccfa4768f75edc14332009e3f30e08e1992 (diff) | |
| parent | db99903c3588e33aabbcfc07e4265a97cd42ccd3 (diff) | |
Merge pull request #4028 from crobibero/cache-duration
Properly verify cache duration
Diffstat (limited to 'Jellyfin.Api/Controllers/ImageController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/ImageController.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/ImageController.cs b/Jellyfin.Api/Controllers/ImageController.cs index ca9c2fa46..a204fe35c 100644 --- a/Jellyfin.Api/Controllers/ImageController.cs +++ b/Jellyfin.Api/Controllers/ImageController.cs @@ -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))); // 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; return new ContentResult(); |