diff options
| author | gion <oancaionutandrei@gmail.com> | 2020-05-15 18:59:35 +0200 |
|---|---|---|
| committer | gion <oancaionutandrei@gmail.com> | 2020-05-15 18:59:35 +0200 |
| commit | 029bb80910688cb4a0278dec949926efd5602258 (patch) | |
| tree | d835ed8a4f6ee890c7da39f3aced53b995b77f33 /Emby.Server.Implementations/HttpServer/HttpResultFactory.cs | |
| parent | e8f45248aab753797ee9b2e3d8d58c2a243fc598 (diff) | |
| parent | 18953d95e6692290bf56547d4c9614790687654c (diff) | |
Merge remote-tracking branch 'upstream/master' into syncplay
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; |