1 files changed, 10 insertions, 12 deletions
diff --git a/SocketHttpListener/HttpResponse.cs b/SocketHttpListener/HttpResponse.cs
index 5aca28c7c..154a3d8e9 100644
--- a/SocketHttpListener/HttpResponse.cs
+++ b/SocketHttpListener/HttpResponse.cs
@@ -7,6 +7,7 @@ using HttpStatusCode = SocketHttpListener.Net.HttpStatusCode;
 using HttpVersion = SocketHttpListener.Net.HttpVersion;
 using System.Linq;
 using MediaBrowser.Model.Services;
+using SocketHttpListener.Net;
 
 namespace SocketHttpListener
 {
@@ -51,10 +52,18 @@ namespace SocketHttpListener
         {
             get
             {
-                return Headers.GetCookies(true);
+                return GetCookies(Headers, true);
             }
         }
 
+        private CookieCollection GetCookies(QueryParamCollection headers, bool response)
+        {
+            var name = response ? "Set-Cookie" : "Cookie";
+            return headers == null || !headers.Contains(name)
+                   ? new CookieCollection()
+                   : CookieHelper.Parse(headers[name], response);
+        }
+
         public bool IsProxyAuthenticationRequired
         {
             get
@@ -111,17 +120,6 @@ namespace SocketHttpListener
             return res;
         }
 
-        internal static HttpResponse CreateWebSocketResponse()
-        {
-            var res = new HttpResponse(HttpStatusCode.SwitchingProtocols);
-
-            var headers = res.Headers;
-            headers["Upgrade"] = "websocket";
-            headers["Connection"] = "Upgrade";
-
-            return res;
-        }
-
         #endregion
 
         #region Public Methods