Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 14 insertions, 1 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
index e6942fae6..5a5a2dd04 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -99,6 +99,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return result;
         }
 
+        private bool SupportsCompression
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         /// <summary>
         /// Gets the optimized result.
         /// </summary>
@@ -116,7 +124,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 throw new ArgumentNullException("result");
             }
 
-            var optimizedResult = requestContext.ToOptimizedResult(result);
+            var optimizedResult = SupportsCompression ? requestContext.ToOptimizedResult(result) : result;
 
             if (responseHeaders != null)
             {
@@ -458,6 +466,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 }
             }
 
+            if (!SupportsCompression)
+            {
+                return new HttpResult(content, contentType);
+            }
+
             var contents = content.Compress(requestContext.CompressionType);
 
             return new CompressedResult(contents, requestContext.CompressionType, contentType);