Merge pull request #333 from justcoding121/develop

netstandard2 proxy start fix

Author: justcoding121

Titanium.Web.Proxy/ProxyServer.cs

@@ -34,11 +34,6 @@ public partial class ProxyServer : IDisposable
         internal const string UriSchemeHttps = "https";
 #endif
 
-        /// <summary>
-        /// Is the proxy currently running
-        /// </summary>
-        private bool proxyRunning { get; set; }
-
         /// <summary>
         /// An default exception log func
         /// </summary>
@@ -225,7 +220,7 @@ public CertificateEngine CertificateEngine
         /// <summary>
         /// Is the proxy currently running
         /// </summary>
-        public bool ProxyRunning => proxyRunning;
+        public bool ProxyRunning { get; private set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether requests will be chained to upstream gateway.
@@ -354,7 +349,7 @@ public void AddEndPoint(ProxyEndPoint endPoint)
 
             ProxyEndPoints.Add(endPoint);
 
-            if (proxyRunning)
+            if (ProxyRunning)
             {
                 Listen(endPoint);
             }
@@ -374,7 +369,7 @@ public void RemoveEndPoint(ProxyEndPoint endPoint)
 
             ProxyEndPoints.Remove(endPoint);
 
-            if (proxyRunning)
+            if (ProxyRunning)
             {
                 QuitListen(endPoint);
             }
@@ -533,7 +528,7 @@ public void DisableAllSystemProxies()
         /// </summary>
         public void Start()
         {
-            if (proxyRunning)
+            if (ProxyRunning)
             {
                 throw new Exception("Proxy is already running.");
             }
@@ -575,6 +570,8 @@ public void Start()
             }
 #endif
 
+            ProxyRunning = true;
+
             foreach (var endPoint in ProxyEndPoints)
             {
                 Listen(endPoint);
@@ -587,8 +584,6 @@ public void Start()
                 //clear orphaned windows auth states every 2 minutes
                 WinAuthEndPoint.ClearIdleStates(2);
             }
-
-            proxyRunning = true;
         }
 
 
@@ -597,7 +592,7 @@ public void Start()
         /// </summary>
         public void Stop()
         {
-            if (!proxyRunning)
+            if (!ProxyRunning)
             {
                 throw new Exception("Proxy is not running.");
             }
@@ -623,7 +618,7 @@ public void Stop()
 
             CertificateManager?.StopClearIdleCertificates();
 
-            proxyRunning = false;
+            ProxyRunning = false;
         }
 
         /// <summary>
@@ -653,7 +648,7 @@ private void Dispose(CustomBufferedStream clientStream, CustomBinaryReader clien
         /// </summary>
         public void Dispose()
         {
-            if (proxyRunning)
+            if (ProxyRunning)
             {
                 Stop();
             }
@@ -683,7 +678,7 @@ private async void Listen(ProxyEndPoint endPoint)
 
             endPoint.Port = ((IPEndPoint)endPoint.Listener.LocalEndpoint).Port;
 
-            while (proxyRunning)
+            while (ProxyRunning)
             {
                 try
                 {
@@ -712,7 +707,7 @@ private void ValidateEndPointAsSystemProxy(ExplicitProxyEndPoint endPoint)
                 throw new Exception("Cannot set endPoints not added to proxy as system proxy");
             }
 
-            if (!proxyRunning)
+            if (!ProxyRunning)
             {
                 throw new Exception("Cannot set system proxy settings before proxy has been started.");
             }