[HttpListener] Close idle connections on Stop()

[mono.git] / mcs / class / System / System.Net / HttpListener.cs

diff --git a/mcs/class/System/System.Net/HttpListener.cs b/mcs/class/System/System.Net/HttpListener.cs
index 79d4aac860816c4d7a417a9d20fe85320dca090d..5551ec810252fa85883f8d9e194466c76bfd24e3 100644 (file)
--- a/mcs/class/System/System.Net/HttpListener.cs
+++ b/mcs/class/System/System.Net/HttpListener.cs
@@ -45,11 +45,13 @@ namespace System.Net {
                Hashtable registry;   // Dictionary<HttpListenerContext,HttpListenerContext> 
                ArrayList ctx_queue;  // List<HttpListenerContext> ctx_queue;
                ArrayList wait_queue; // List<ListenerAsyncResult> wait_queue;
+               Hashtable connections;
 
                public HttpListener ()
                {
                        prefixes = new HttpListenerPrefixCollection (this);
                        registry = new Hashtable ();
+                       connections = Hashtable.Synchronized (new Hashtable ());
                        ctx_queue = new ArrayList ();
                        wait_queue = new ArrayList ();
                        auth_schemes = AuthenticationSchemes.Anonymous;
@@ -135,7 +137,7 @@ namespace System.Net {
                                return;
                        }
 
-                       Close (false);
+                       Close (true);
                        disposed = true;
                }
 
@@ -153,12 +155,18 @@ namespace System.Net {
                                        foreach (HttpListenerContext context in registry.Keys) {
                                                context.Connection.Close ();
                                        }
-                                       registry.Clear (); // Just in case.
+                                       registry.Clear ();
                                }
 
+                               lock (connections) {
+                                       foreach (HttpConnection cnc in connections.Keys) {
+                                               cnc.Close (true);
+                                       }
+                                       connections.Clear ();
+                               }
                                lock (ctx_queue) {
                                        foreach (HttpListenerContext context in ctx_queue)
-                                               context.Connection.Close ();
+                                               context.Connection.Close (true);
 
                                        ctx_queue.Clear ();
                                }
@@ -310,6 +318,16 @@ namespace System.Net {
                                        ctx_queue.RemoveAt (idx);
                        }
                }
+
+               internal void AddConnection (HttpConnection cnc)
+               {
+                       connections [cnc] = cnc;
+               }
+
+               internal void RemoveConnection (HttpConnection cnc)
+               {
+                       connections.Remove (cnc);
+               }
        }
 }
 #endif