From ef01b4aa5edf5586a7508a86d2f4539b0e061a1d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 23 Oct 2019 15:18:21 +0800
Subject: [PATCH] fix pac

---
 v2rayN/v2rayN/Base/HttpWebServerB.cs          |  6 ++++
 v2rayN/v2rayN/Forms/MainForm.cs               | 31 +++++++------------
 v2rayN/v2rayN/Handler/SpeedtestHandler.cs     |  3 ++
 v2rayN/v2rayN/Handler/StatisticsHandler.cs    |  1 +
 .../HttpProxyHandler/HttpProxyHandle.cs       | 13 ++++----
 .../HttpProxyHandler/PACServerHandle.cs       | 31 ++++++++++++-------
 v2rayN/v2rayN/Properties/AssemblyInfo.cs      |  2 +-
 7 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/v2rayN/v2rayN/Base/HttpWebServerB.cs b/v2rayN/v2rayN/Base/HttpWebServerB.cs
index 70ac2759993..73e596d11dc 100644
--- a/v2rayN/v2rayN/Base/HttpWebServerB.cs
+++ b/v2rayN/v2rayN/Base/HttpWebServerB.cs
@@ -39,8 +39,14 @@ private void StartListen()
 
             while (true)
             {
+                if (!listener.Pending())
+                {
+                    continue;
+                }
+
                 TcpClient socket = listener.AcceptTcpClient();
                 Thread thread = new Thread(new ParameterizedThreadStart(ProcessThread));
+                thread.IsBackground = true;
                 thread.Start(socket);
                 Thread.Sleep(1);
             }
diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index 5f31540f88c..76e27d3c9b8 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -33,6 +33,13 @@ public MainForm()
             Application.ApplicationExit += (sender, args) =>
             {
                 Utils.ClearTempPath();
+
+                v2rayHandler.V2rayStop();
+                HttpProxyHandle.CloseHttpAgent(config);
+                PACServerHandle.Stop();
+
+                ConfigHandler.SaveConfig(ref config);
+                statistics?.SaveToFile();
                 statistics?.Close();
             };
         }
@@ -79,18 +86,9 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
             if (e.CloseReason == CloseReason.UserClosing)
             {
                 e.Cancel = true;
-
-                statistics?.SaveToFile();
-
                 HideForm();
                 return;
-            }
-            if (e.CloseReason == CloseReason.ApplicationExitCall)
-            {
-                ConfigHandler.SaveConfig(ref config);
-                statistics?.SaveToFile();
-                statistics?.Close();
-            }
+            } 
         }
 
         private void MainForm_Resize(object sender, EventArgs e)
@@ -117,7 +115,7 @@ protected override void WndProc(ref Message m)
             {
                 case WM_QUERYENDSESSION:
                     Utils.SaveLog("Windows shutdown UnsetProxy");
-                    //CloseV2ray();
+                 
                     ConfigHandler.ToJsonFile(config);
                     statistics?.SaveToFile();
                     ProxySetting.UnsetProxy();
@@ -1006,16 +1004,11 @@ private void notifyMain_MouseClick(object sender, MouseEventArgs e)
         }
 
         private void menuExit_Click(object sender, EventArgs e)
-        {
-            CloseV2ray();
+        {        
 
             this.Visible = false;
-            this.Close();
-
-            statistics?.Close();
-
-            //this.Dispose();
-            //System.Environment.Exit(System.Environment.ExitCode);
+            this.Close();            
+             
             Application.Exit();
         }
 
diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index fefabfe4032..f5d82f50f25 100644
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -37,16 +37,19 @@ public SpeedtestHandler(ref Config config, ref V2rayHandler v2rayHandler, List<i
             if (actionType == "ping")
             {
                 _workThread = new Thread(new ThreadStart(RunPing));
+                _workThread.IsBackground = true;
                 _workThread.Start();
             }
             if (actionType == "tcping")
             {
                 _workThread = new Thread(new ThreadStart(RunTcping));
+                _workThread.IsBackground = true;
                 _workThread.Start();
             }
             else if (actionType == "realping")
             {
                 _workThread = new Thread(new ThreadStart(RunRealPing));
+                _workThread.IsBackground = true;
                 _workThread.Start();
             }
             else if (actionType == "speedtest")
diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
index 12a9154e63f..a61f634a9d9 100644
--- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
@@ -105,6 +105,7 @@ public StatisticsHandler(Mode.Config config, Action<ulong, ulong, ulong, ulong,
             GrpcInit();
 
             workThread_ = new Thread(new ThreadStart(Run));
+            workThread_.IsBackground = true;
             workThread_.Start();
         }
 
diff --git a/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs b/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
index 71dd88de5e9..4f1eca5f04c 100644
--- a/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
@@ -30,33 +30,33 @@ public static bool Update(Config config, bool forceDisable)
                     }
                     if (type == 1)
                     {
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                         SysProxyHandle.SetIEProxy(true, true, $"{Global.Loopback}:{port}", null);
                     }
                     else if (type == 2)
                     {
                         string pacUrl = GetPacUrl();
                         SysProxyHandle.SetIEProxy(true, false, null, pacUrl);
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                         PACServerHandle.Init(config);
                     }
                     else if (type == 3)
                     {
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                         SysProxyHandle.SetIEProxy(false, false, null, null);
                     }
                     else if (type == 4)
                     {
                         string pacUrl = GetPacUrl();
                         SysProxyHandle.SetIEProxy(false, false, null, null);
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                         PACServerHandle.Init(config);
                     }
                 }
                 else
                 {
                     SysProxyHandle.SetIEProxy(false, false, null, null);
-                    PACServerHandle.Stop();
+                    //PACServerHandle.Stop();
                 }
             }
             catch (Exception ex)
@@ -104,8 +104,7 @@ public static void CloseHttpAgent(Config config)
 
                 Global.sysAgent = false;
                 Global.socksPort = 0;
-                Global.httpPort = 0;
-                Global.pacPort = 0;
+                Global.httpPort = 0; 
             }
             catch
             {
diff --git a/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs b/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs
index 0df8466b277..d3902d7f596 100644
--- a/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs
@@ -28,6 +28,8 @@ public static bool IsRunning
 
         public static void Init(Config config)
         {
+            Global.pacPort = config.GetLocalPort("pac");
+
             if (InitServer("*"))
             {
                 pacPort = Global.pacPort;
@@ -122,18 +124,23 @@ public static string SendResponse(string address)
 
         public static void Stop()
         {
-            //try
-            //{
-            //    if (server != null)
-            //    {
-            //        server.Stop();
-            //        server = null;
-            //    }
-            //}
-            //catch (Exception ex)
-            //{
-            //    Utils.SaveLog("Webserver Stop " + ex.Message);
-            //}
+            try
+            {
+                if (server != null)
+                {
+                    server.Stop();
+                    server = null;
+                }
+                if (serverB != null)
+                {
+                    serverB.Stop();
+                    serverB = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog("Webserver Stop " + ex.Message);
+            }
 
             //try
             //{
diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
index 8b56fc9b33c..2ae7cde9fc6 100644
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("2.46")]
+[assembly: AssemblyFileVersion("2.47")]