diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-05-03 01:04:19 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-05-03 01:04:19 -0400 |
| commit | 1c06111497f0ecfa6ca374599b5641601b004077 (patch) | |
| tree | 8d83bd03b76f87f429ab82a54fd73bc029eae6f0 /Emby.Server.Implementations/HttpServer/HttpResultFactory.cs | |
| parent | 7e467f9faa18168ddff0607751f3929e4e3e0285 (diff) | |
| parent | 2bf3dee4c4fe56537c542bcc0c9df562552fb74d (diff) | |
Merge remote-tracking branch 'upstream/master' into integration-tests
Diffstat (limited to 'Emby.Server.Implementations/HttpServer/HttpResultFactory.cs')
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/HttpResultFactory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs index 464ca3a0b..2e9ecc4ae 100644 --- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs +++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs @@ -426,7 +426,7 @@ namespace Emby.Server.Implementations.HttpServer if (!noCache) { - if (!DateTime.TryParseExact(requestContext.Headers[HeaderNames.IfModifiedSince], HttpDateFormat, _enUSculture, DateTimeStyles.AssumeUniversal, out var ifModifiedSinceHeader)) + if (!DateTime.TryParseExact(requestContext.Headers[HeaderNames.IfModifiedSince], HttpDateFormat, _enUSculture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out var ifModifiedSinceHeader)) { _logger.LogDebug("Failed to parse If-Modified-Since header date: {0}", requestContext.Headers[HeaderNames.IfModifiedSince]); return null; |