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

3 files changed, 7 insertions, 7 deletions

diff --git a/SocketHttpListener.Portable/Net/EndPointListener.cs b/SocketHttpListener.Portable/Net/EndPointListener.cs
index 2bd7a3da6..c7642d5d1 100644
--- a/SocketHttpListener.Portable/Net/EndPointListener.cs
+++ b/SocketHttpListener.Portable/Net/EndPointListener.cs
@@ -17,7 +17,7 @@ namespace SocketHttpListener.Net
     {
         HttpListener listener;
         IpEndPointInfo endpoint;
-        ISocket sock;
+        IAcceptSocket sock;
         Dictionary<ListenerPrefix,HttpListener> prefixes;  // Dictionary <ListenerPrefix, HttpListener>
         List<ListenerPrefix> unhandled; // List<ListenerPrefix> unhandled; host = '*'
         List<ListenerPrefix> all;       // List<ListenerPrefix> all;  host = '+'
@@ -95,7 +95,7 @@ namespace SocketHttpListener.Net
             _closed = false;
         }
 
-        private async void ProcessAccept(ISocket accepted)
+        private async void ProcessAccept(IAcceptSocket accepted)
         {
             try
             {
diff --git a/SocketHttpListener.Portable/Net/HttpConnection.cs b/SocketHttpListener.Portable/Net/HttpConnection.cs
index 3baffd258..4a2cf3f5b 100644
--- a/SocketHttpListener.Portable/Net/HttpConnection.cs
+++ b/SocketHttpListener.Portable/Net/HttpConnection.cs
@@ -14,7 +14,7 @@ namespace SocketHttpListener.Net
     sealed class HttpConnection
     {
         const int BufferSize = 8192;
-        ISocket sock;
+        IAcceptSocket sock;
         Stream stream;
         EndPointListener epl;
         MemoryStream ms;
@@ -41,7 +41,7 @@ namespace SocketHttpListener.Net
         private readonly ITextEncoding _textEncoding;
         private readonly IStreamFactory _streamFactory;
 
-        private HttpConnection(ILogger logger, ISocket sock, EndPointListener epl, bool secure, ICertificate cert, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
+        private HttpConnection(ILogger logger, IAcceptSocket sock, EndPointListener epl, bool secure, ICertificate cert, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
         {
             _logger = logger;
             this.sock = sock;
@@ -82,7 +82,7 @@ namespace SocketHttpListener.Net
             Init();
         }
 
-        public static async Task<HttpConnection> Create(ILogger logger, ISocket sock, EndPointListener epl, bool secure, ICertificate cert, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
+        public static async Task<HttpConnection> Create(ILogger logger, IAcceptSocket sock, EndPointListener epl, bool secure, ICertificate cert, ICryptoProvider cryptoProvider, IStreamFactory streamFactory, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
         {
             var connection = new HttpConnection(logger, sock, epl, secure, cert, cryptoProvider, streamFactory, memoryStreamFactory, textEncoding);
 
@@ -527,7 +527,7 @@ namespace SocketHttpListener.Net
                     return;
                 }
 
-                ISocket s = sock;
+                IAcceptSocket s = sock;
                 sock = null;
                 try
                 {
diff --git a/SocketHttpListener.Portable/Primitives/IStreamFactory.cs b/SocketHttpListener.Portable/Primitives/IStreamFactory.cs
index f189b95b4..57e21e31b 100644
--- a/SocketHttpListener.Portable/Primitives/IStreamFactory.cs
+++ b/SocketHttpListener.Portable/Primitives/IStreamFactory.cs
@@ -10,7 +10,7 @@ namespace SocketHttpListener.Primitives
 {
     public interface IStreamFactory
     {
-        Stream CreateNetworkStream(ISocket socket, bool ownsSocket);
+        Stream CreateNetworkStream(IAcceptSocket acceptSocket, bool ownsSocket);
         Stream CreateSslStream(Stream innerStream, bool leaveInnerStreamOpen);
 
         Task AuthenticateSslStreamAsServer(Stream stream, ICertificate certificate);