Merge pull request #1 from MediaBrowser/master

Update to latest

1 files changed, 18 insertions, 7 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
index ac1621709..e0a5764d5 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Server.Implementations.HttpServer.SocketSharp;
 using ServiceStack;
 using ServiceStack.Web;
 using System;
@@ -66,13 +67,23 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
                     if (length > 0)
                     {
-                        var response = (HttpListenerResponse)res.OriginalResponse;
-
-                        response.ContentLength64 = length;
-                       
-                        // Disable chunked encoding. Technically this is only needed when using Content-Range, but
-                        // anytime we know the content length there's no need for it
-                        response.SendChunked = false;
+                        res.SetContentLength(length);
+                        
+                        var listenerResponse = res.OriginalResponse as HttpListenerResponse;
+
+                        if (listenerResponse != null)
+                        {
+                            // Disable chunked encoding. Technically this is only needed when using Content-Range, but
+                            // anytime we know the content length there's no need for it
+                            listenerResponse.SendChunked = false;
+                            return;
+                        }
+
+                        var sharpResponse = res as WebSocketSharpResponse;
+                        if (sharpResponse != null)
+                        {
+                            sharpResponse.SendChunked = false;
+                        }
                     }
                 }
             }