Merge pull request #2677 from MediaBrowser/beta

Beta

1 files changed, 14 insertions, 13 deletions

diff --git a/Emby.Server.Core/HttpServerFactory.cs b/Emby.Server.Core/HttpServerFactory.cs
index dfd435c33..e16cbea0e 100644
--- a/Emby.Server.Core/HttpServerFactory.cs
+++ b/Emby.Server.Core/HttpServerFactory.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Net.Security;
 using System.Net.Sockets;
 using System.Security.Cryptography.X509Certificates;
+using System.Threading;
 using System.Threading.Tasks;
 using Emby.Common.Implementations.Net;
 using Emby.Server.Implementations.HttpServer;
@@ -33,10 +34,10 @@ namespace Emby.Server.Core
         /// <returns>IHttpServer.</returns>
         public static IHttpServer CreateServer(IServerApplicationHost applicationHost,
             ILogManager logManager,
-            IServerConfigurationManager config, 
+            IServerConfigurationManager config,
             INetworkManager networkmanager,
             IMemoryStreamFactory streamProvider,
-            string serverName, 
+            string serverName,
             string defaultRedirectpath,
             ITextEncoding textEncoding,
             ISocketFactory socketFactory,
@@ -51,16 +52,16 @@ namespace Emby.Server.Core
             var logger = logManager.GetLogger("HttpServer");
 
             return new HttpListenerHost(applicationHost,
-                logger, 
-                config, 
-                serverName, 
-                defaultRedirectpath, 
-                networkmanager, 
-                streamProvider, 
-                textEncoding, 
-                socketFactory, 
-                cryptoProvider, 
-                json, 
+                logger,
+                config,
+                serverName,
+                defaultRedirectpath,
+                networkmanager,
+                streamProvider,
+                textEncoding,
+                socketFactory,
+                cryptoProvider,
+                json,
                 xml,
                 environment,
                 certificate,
@@ -82,7 +83,7 @@ namespace Emby.Server.Core
         {
             var netSocket = (NetAcceptSocket)acceptSocket;
 
-            return new NetworkStream(netSocket.Socket, ownsSocket);
+            return new SocketStream(netSocket.Socket, ownsSocket);
         }
 
         public Task AuthenticateSslStreamAsServer(Stream stream, ICertificate certificate)