Fix HttpListenerContext.Close()

Author: mortezag

Framework/Core/System/HTTP/System.Net.HttpListenerContext.cs

@@ -150,8 +150,7 @@ public void Close()
         public void Close(int lingerValue)
         {
             try
-            {                
-                // Close the underlying stream
+            {  
                 if (m_clientOutputStream != null)
                 {
                     try
@@ -162,9 +161,21 @@ public void Close(int lingerValue)
                         }
                     }
                     catch{}
+                }
+                
+                if (m_ResponseToClient != null)
+                {
+                    m_ResponseToClient.Close();
+                    m_ResponseToClient = null;
+                }
+                
+                // Close the underlying stream
+                if (m_clientOutputStream != null)
+                {
                     m_clientOutputStream.Dispose();
                     m_clientOutputStream = null;
                 }
+                
                 if (m_clientInputStream != null)
                 {
                     m_clientInputStream.Dispose();

Framework/Core/System/HTTP/System.Net.HttpListenerResponse.cs

@@ -439,20 +439,24 @@ void IDisposable.Dispose()
         {
             if (!m_IsResponseClosed)
             {
-                // Iterates over list of client connections and remove its stream from it.
-                m_Listener.RemoveClientStream(m_clientStream);
+                try
+                {
+                    // Iterates over list of client connections and remove its stream from it.
+                    m_Listener.RemoveClientStream(m_clientStream);
 
-                m_clientStream.Flush();
+                    m_clientStream.Flush();
 
-                // If KeepAlive is true,
-                if (m_KeepAlive)
-                {   // Then socket is tramsferred to the list of waiting for new data.
-                    m_Listener.AddToWaitingConnections(m_clientStream);
-                }
-                else  // If not KeepAlive then close
-                {
-                    m_clientStream.Dispose();
+                    // If KeepAlive is true,
+                    if (m_KeepAlive)
+                    {   // Then socket is tramsferred to the list of waiting for new data.
+                        m_Listener.AddToWaitingConnections(m_clientStream);
+                    }
+                    else  // If not KeepAlive then close
+                    {
+                        m_clientStream.Dispose();
+                    }
                 }
+                catch{}
 
                 m_IsResponseClosed = true;
             }