wasSharpNET – Diff between revs 9 and 10

Subversion Repositories:

?pathlinks?

Rev 9 – Rev 11 – Go to most recent revision – Details – Blame – Last modification – View Log

 namespace wasSharpNET.Network.HTTP
+{
     public abstract class HTTPServer
+    {
         private int activeRequests;
-        private readonly HttpListener HTTPListener = new HttpListener();
+        private readonly HttpListener HTTPListener = new HttpListener()
+        {
+            AuthenticationSchemes = AuthenticationSchemes.None
+        };
         private int processedRequests;
-        private readonly ManualResetEvent stopEvent = new ManualResetEvent(false);
+        private readonly AutoResetEvent StopServerEvent = new AutoResetEvent(false);
-        public HashSet<string> Prefixes { get; set; } = new HashSet<string>();
-        public AuthenticationSchemes AuthenticationSchemes { get; set; } = AuthenticationSchemes.None;
-        public bool IsRunning => HTTPListener.IsListening;
+        private readonly AutoResetEvent ServerStoppedEvent = new AutoResetEvent(false);
+        public AuthenticationSchemes AuthenticationSchemes
+        {
-        public bool Start()
+            get
+            {
+                return HTTPListener.AuthenticationSchemes;
+            }
-            foreach (var prefix in Prefixes)
+            set
-            {
                 if (!HTTPListener.Prefixes.Contains(prefix))
+                HTTPListener.AuthenticationSchemes = value;
-                    HTTPListener.Prefixes.Add(prefix);
+            }
-            }
+        }
         public bool IsRunning => HTTPListener.IsListening;
             // Set up HTTP listener.
-            HTTPListener.AuthenticationSchemes = AuthenticationSchemes;
+        public bool Start(IEnumerable<string> prefixes)
+        {
+            // Do not start the HTTP server if it is already running.
+            if (HTTPListener.IsListening)
+                return false;
+            // Add all prefixes.
             foreach (var prefix in prefixes)
             // Do not start the HTTP server if it is already running.
-            if (HTTPListener.IsListening)
+                HTTPListener.Prefixes.Add(prefix);
-                return false;
+            }
             // Do not bomb if the client disconnects.
-            HTTPListener.IgnoreWriteExceptions = true;
+            // Do not bomb if the client disconnects.
-            HTTPListener.Start();
+            HTTPListener.IgnoreWriteExceptions = true;
-            var state = new HTTPServerCallbackState(HTTPListener);
+            HTTPListener.Start();
-            ThreadPool.QueueUserWorkItem(Listen, state);
+            ThreadPool.QueueUserWorkItem(Listen, new HTTPServerCallbackState(HTTPListener));
+            return true;
+        }
-            return true;
+        public bool Stop()
+        {
             StopServerEvent.Set();
-        public bool Stop()
+            ServerStoppedEvent.WaitOne();
             HTTPListener.Prefixes.Clear();
-            return stopEvent.Set();
+            return true;
+        }
         private void Listen(object state)
+        {
             var callbackState = (HTTPServerCallbackState) state;
             while (callbackState.Listener.IsListening)
+            {
+                callbackState.Listener.BeginGetContext(ContextCallback, callbackState);
+                var n = WaitHandle.WaitAny(new WaitHandle[] {callbackState.ContextRetrieved, StopServerEvent});
                 callbackState.Listener.BeginGetContext(ContextCallback, callbackState);
-                var n = WaitHandle.WaitAny(new WaitHandle[] {callbackState.ContextRetrieved, stopEvent});
+                if (n.Equals(1))
+                {