aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily <JustAMan@users.noreply.github.com>2020-04-28 01:56:39 +0300
committerGitHub <noreply@github.com>2020-04-28 01:56:39 +0300
commitfa46a61ee3d9f12fc0f27a3de2506097d53d16d3 (patch)
treed1b7530268c883804d54aa9b56ee8d387e54bde1
parentab8a5595f609ab54e017ecabadc841d181acd4d9 (diff)
parent655208d375bce4a5c82bf8da87d5d72814a8da83 (diff)
Merge pull request #2995 from JustAMan/fix-cache-for-real
Now parse date in header correctly as being in UTC
-rw-r--r--Emby.Server.Implementations/HttpServer/HttpResultFactory.cs2
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;