Merge pull request #1109 from MediaBrowser/dev

3.0.5621.3

1 files changed, 6 insertions, 2 deletions

diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 639c1f54b..8c6cc0a18 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -625,6 +625,8 @@ namespace MediaBrowser.Api.Images
 
             var file = await _imageProcessor.ProcessImage(options).ConfigureAwait(false);
 
+            headers["Vary"] = "Accept";
+
             return ResultFactory.GetStaticFileResult(Request, new StaticFileResultOptions
             {
                 CacheDuration = cacheDuration,
@@ -659,8 +661,10 @@ namespace MediaBrowser.Api.Images
                 return ImageFormat.Png;
             }
 
-            if (string.Equals(Path.GetExtension(image.Path), ".jpg", StringComparison.OrdinalIgnoreCase) ||
-                string.Equals(Path.GetExtension(image.Path), ".jpeg", StringComparison.OrdinalIgnoreCase))
+            var extension = Path.GetExtension(image.Path);
+
+            if (string.Equals(extension, ".jpg", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(extension, ".jpeg", StringComparison.OrdinalIgnoreCase))
             {
                 return ImageFormat.Jpg;
             }