update responses

5 files changed, 10 insertions, 52 deletions

diff --git a/SocketHttpListener.Portable/Net/EndPointListener.cs b/SocketHttpListener.Portable/Net/EndPointListener.cs
index b50660ad0..52385e2ba 100644
--- a/SocketHttpListener.Portable/Net/EndPointListener.cs
+++ b/SocketHttpListener.Portable/Net/EndPointListener.cs
@@ -119,7 +119,6 @@ namespace SocketHttpListener.Net
             if (listener == null)
                 return false;
 
-            context.Listener = listener;
             context.Connection.Prefix = prefix;
             return true;
         }
@@ -129,7 +128,7 @@ namespace SocketHttpListener.Net
             if (context == null || context.Request == null)
                 return;
 
-            context.Listener.UnregisterContext(context);
+            listener.UnregisterContext(context);
         }
 
         HttpListener SearchListener(Uri uri, out ListenerPrefix prefix)
diff --git a/SocketHttpListener.Portable/Net/HttpConnection.cs b/SocketHttpListener.Portable/Net/HttpConnection.cs
index d31da4132..db34c4218 100644
--- a/SocketHttpListener.Portable/Net/HttpConnection.cs
+++ b/SocketHttpListener.Portable/Net/HttpConnection.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.IO;
@@ -210,12 +209,7 @@ namespace SocketHttpListener.Net
             // TODO: can we get this stream before reading the input?
             if (o_stream == null)
             {
-                HttpListener listener = context.Listener;
-
-                if (listener == null)
-                    return new ResponseStream(stream, context.Response, true, _memoryStreamFactory, _textEncoding);
-
-                o_stream = new ResponseStream(stream, context.Response, listener.IgnoreWriteExceptions, _memoryStreamFactory, _textEncoding);
+                o_stream = new ResponseStream(stream, context.Response, _memoryStreamFactory, _textEncoding);
             }
             return o_stream;
         }
@@ -257,7 +251,7 @@ namespace SocketHttpListener.Net
                     Close(true);
                     return;
                 }
-                HttpListener listener = context.Listener;
+                HttpListener listener = epl.Listener;
                 if (last_listener != listener)
                 {
                     RemoveConnection();
diff --git a/SocketHttpListener.Portable/Net/HttpListener.cs b/SocketHttpListener.Portable/Net/HttpListener.cs
index 83660100a..2b0f75d01 100644
--- a/SocketHttpListener.Portable/Net/HttpListener.cs
+++ b/SocketHttpListener.Portable/Net/HttpListener.cs
@@ -28,7 +28,6 @@ namespace SocketHttpListener.Net
         HttpListenerPrefixCollection prefixes;
         AuthenticationSchemeSelector auth_selector;
         string realm;
-        bool ignore_write_exceptions;
         bool unsafe_ntlm_auth;
         bool listening;
         bool disposed;
@@ -92,16 +91,6 @@ namespace SocketHttpListener.Net
             }
         }
 
-        public bool IgnoreWriteExceptions
-        {
-            get { return ignore_write_exceptions; }
-            set
-            {
-                CheckDisposed();
-                ignore_write_exceptions = value;
-            }
-        }
-
         public bool IsListening
         {
             get { return listening; }
diff --git a/SocketHttpListener.Portable/Net/HttpListenerContext.cs b/SocketHttpListener.Portable/Net/HttpListenerContext.cs
index 84c6a8c19..182fd2d2a 100644
--- a/SocketHttpListener.Portable/Net/HttpListenerContext.cs
+++ b/SocketHttpListener.Portable/Net/HttpListenerContext.cs
@@ -18,7 +18,6 @@ namespace SocketHttpListener.Net
         HttpConnection cnc;
         string error;
         int err_status = 400;
-        internal HttpListener Listener;
         private readonly ILogger _logger;
         private readonly ICryptoProvider _cryptoProvider;
         private readonly IMemoryStreamFactory _memoryStreamFactory;
diff --git a/SocketHttpListener.Portable/Net/ResponseStream.cs b/SocketHttpListener.Portable/Net/ResponseStream.cs
index 6ecbf9742..07788ea41 100644
--- a/SocketHttpListener.Portable/Net/ResponseStream.cs
+++ b/SocketHttpListener.Portable/Net/ResponseStream.cs
@@ -17,17 +17,15 @@ namespace SocketHttpListener.Net
     class ResponseStream : Stream
     {
         HttpListenerResponse response;
-        bool ignore_errors;
         bool disposed;
         bool trailer_sent;
         Stream stream;
         private readonly IMemoryStreamFactory _memoryStreamFactory;
         private readonly ITextEncoding _textEncoding;
 
-        internal ResponseStream(Stream stream, HttpListenerResponse response, bool ignore_errors, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
+        internal ResponseStream(Stream stream, HttpListenerResponse response, IMemoryStreamFactory memoryStreamFactory, ITextEncoding textEncoding)
         {
             this.response = response;
-            this.ignore_errors = ignore_errors;
             _memoryStreamFactory = memoryStreamFactory;
             _textEncoding = textEncoding;
             this.stream = stream;
@@ -130,18 +128,7 @@ namespace SocketHttpListener.Net
 
         internal void InternalWrite(byte[] buffer, int offset, int count)
         {
-            if (ignore_errors)
-            {
-                try
-                {
-                    stream.Write(buffer, offset, count);
-                }
-                catch { }
-            }
-            else
-            {
-                stream.Write(buffer, offset, count);
-            }
+            stream.Write(buffer, offset, count);
         }
 
         public override void Write(byte[] buffer, int offset, int count)
@@ -214,23 +201,13 @@ namespace SocketHttpListener.Net
                 InternalWrite(bytes, 0, bytes.Length);
             }
 
-            try
-            {
-                if (count > 0)
-                {
-                    await stream.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
-                }
-
-                if (response.SendChunked)
-                    stream.Write(crlf, 0, 2);
-            }
-            catch
+            if (count > 0)
             {
-                if (!ignore_errors)
-                {
-                    throw;
-                }
+                await stream.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
             }
+
+            if (response.SendChunked)
+                stream.Write(crlf, 0, 2);
         }
 
         //public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count,