diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-08 02:24:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 02:24:30 -0500 |
| commit | 23010f2980381a4b56e05620d4604cafc0e00043 (patch) | |
| tree | 418b4ad6964c84d17ff9c33fa88b0e1a8bcacd34 /SocketHttpListener.Portable/Net | |
| parent | 0ac0a09c806112ce82dcd23f43c7df9ff8b5531d (diff) | |
| parent | 314b84ae9ef5a692144b0a3a178ddcbd393c9fb9 (diff) | |
Merge pull request #2516 from MediaBrowser/beta
Beta
Diffstat (limited to 'SocketHttpListener.Portable/Net')
| -rw-r--r-- | SocketHttpListener.Portable/Net/EndPointListener.cs | 4 | ||||
| -rw-r--r-- | SocketHttpListener.Portable/Net/HttpConnection.cs | 8 |
2 files changed, 6 insertions, 6 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 { |
