mirrors/Sheas-Cealer
1
0
Fork 0
mirror of https://github.com/SpaceTimee/Sheas-Cealer.git synced 2025-07-14 05:12:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge c43bc49feb into e1b1c606e1

Browse Source
This commit is contained in:
Racpast 2025-06-27 14:41:41 +08:00 committed by GitHub
commit 1678181bbf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Wins/MainWin.xaml.cs
View File

@ -204,6 +204,8 @@ public partial class MainWin : Window
{ {
HoldButtonTimer?.Stop(); HoldButtonTimer?.Stop();
NginxConfWatcher_Changed(null!, null!);
if (!MainPres.IsConginxRunning && !MainPres.IsNginxRunning) if (!MainPres.IsConginxRunning && !MainPres.IsNginxRunning)
{ {
try try
@ -769,13 +771,9 @@ public partial class MainWin : Window
NginxHttpPort = 80; NginxHttpPort = 80;
NginxHttpsPort = 443; NginxHttpsPort = 443;
foreach (IPEndPoint activeTcpListener in IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners()) HashSet<int> activePorts = new(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners().Select(listener => listener.Port));
if (activeTcpListener.Port == NginxHttpPort) while (activePorts.Contains(NginxHttpPort)) NginxHttpPort++;
NginxHttpPort++; while (activePorts.Contains(NginxHttpsPort)) NginxHttpsPort++;
else if (activeTcpListener.Port == NginxHttpsPort)
NginxHttpsPort++;
else if (activeTcpListener.Port > NginxHttpsPort)
break;
await using FileStream nginxConfStream = new(MainConst.NginxConfPath, FileMode.OpenOrCreate, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete); await using FileStream nginxConfStream = new(MainConst.NginxConfPath, FileMode.OpenOrCreate, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
NginxConfig extraNginxConfig = NginxConfig.Load(ExtraNginxConfs = new StreamReader(nginxConfStream).ReadToEnd()); NginxConfig extraNginxConfig = NginxConfig.Load(ExtraNginxConfs = new StreamReader(nginxConfStream).ReadToEnd());