diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-24 11:31:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 11:31:05 -0500 |
| commit | 8ad6f3df9129403465a0564d758819eb30f25895 (patch) | |
| tree | 1863c384aa934500a44255e9538e29cd1c04b6b7 /Emby.Server.Implementations/HttpServer | |
| parent | 682b02210f42c92e44702f5c9c204bc80c946df5 (diff) | |
| parent | 9606a2a710614404b4dda96cceff688314a1ec89 (diff) | |
Merge pull request #2307 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/HttpServer')
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/HttpResultFactory.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs index f65331ec7..313db6a75 100644 --- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs +++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs @@ -100,7 +100,8 @@ namespace Emby.Server.Implementations.HttpServer responseHeaders = new Dictionary<string, string>(); } - if (addCachePrevention) + string expires; + if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out expires)) { responseHeaders["Expires"] = "-1"; } |