From b799fff85151050c3c27a11955dda9419c6d1ae8 Mon Sep 17 00:00:00 2001
From: Dorian Niemiec <dorian.niemiec@svrjs.org>
Date: Fri, 25 Aug 2023 00:47:57 +0200
Subject: [PATCH] Update to SVR.JS 3.4.23

---
 index.html          |  7 +++----
 licenses/index.html |  8 ++++----
 serverSideScript.js |  1 +
 svr.js              | 18 ++++++++++++------
 tests.html          |  4 ++--
 5 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/index.html b/index.html
index 822fa3e..7de5f2d 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.4.22</title>
+    <title>SVR.JS 3.4.23</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,7 +12,7 @@
     </style>
   </head>
   <body>
-    <h1>Welcome to SVR.JS 3.4.22</h1>
+    <h1>Welcome to SVR.JS 3.4.23</h1>
     <br/>
     <img src="/logo.png" style="width: 256px;" />
     <br/>
@@ -110,8 +110,7 @@
     </div>
     <p>Changes:</p>
     <ul>
-      <li>ENAMETOOLONG errors now correspond to 414 code.</li>
-      <li>EMFILE errors now correspond to 503 code.</li>
+      <li>Fixed server crashes while one of two ports are in use</li>
     </ul>
     <p>Bugs:</p>
     <ul>
diff --git a/licenses/index.html b/licenses/index.html
index cb7d264..377d939 100644
--- a/licenses/index.html
+++ b/licenses/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.4.22 Licenses</title>
+    <title>SVR.JS 3.4.23 Licenses</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,8 +12,8 @@
     </style>
   </head>
   <body>
-    <h1>SVR.JS 3.4.22 Licenses</h1>
-    <h2>SVR.JS 3.4.22</h2>
+    <h1>SVR.JS 3.4.23 Licenses</h1>
+    <h2>SVR.JS 3.4.23</h2>
     <div style="display: inline-block; text-align: left; border-width: 2px; border-style: solid; border-color: gray; padding: 8px;">
       MIT License<br/>
       <br/>
@@ -37,7 +37,7 @@
       OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE<br/>
       SOFTWARE.<br/>
     </div>
-    <h2>Packages used by SVR.JS 3.4.22 and utilities</h2>
+    <h2>Packages used by SVR.JS 3.4.23 and utilities</h2>
     <div style="width: 100%; background-color: #ccc; border: 1px solid green; text-align: left; margin: 10px 0;">
       <div style="float: right;">License: MIT</div>
       <div style="font-size: 20px;">
diff --git a/serverSideScript.js b/serverSideScript.js
index 99b7b6d..255ae32 100644
--- a/serverSideScript.js
+++ b/serverSideScript.js
@@ -67,6 +67,7 @@ if(href == "/hello.svr") {
     //Prevent open proxy
     callServerError(403,"SVR.JS-exampleproxy"); //Server error
     serverconsole.errmessage("Client fails to recieve content."); //Log into SVR.JS
+    return;
   }
   var hdrs = req.headers;
   hdrs["Host"] = (hn == "this" ? req.headers.host : hn);
diff --git a/svr.js b/svr.js
index 3dd2cae..01b8932 100644
--- a/svr.js
+++ b/svr.js
@@ -71,7 +71,7 @@ function deleteFolderRecursive(path) {
 }
 
 var os = require("os");
-var version = "3.4.22";
+var version = "3.4.23";
 var singlethreaded = false;
 
 if (process.versions) process.versions.svrjs = version; //Inject SVR.JS into process.versions
@@ -4349,11 +4349,17 @@ function start(init) {
 
 
   if (!cluster.isPrimary) {
-    if (secure) {
-      server.listen(sport);
-      if (!disableNonEncryptedServer) server2.listen(port);
-    } else {
-      server.listen(port);
+    try {
+      server.listen(secure ? sport : port);
+    } catch(err) {
+      if(err.code != "ERR_SERVER_ALREADY_LISTEN") throw err;
+    }
+    if (secure && !disableNonEncryptedServer) {
+      try {
+        server2.listen(port);
+      } catch(err) {
+        if(err.code != "ERR_SERVER_ALREADY_LISTEN") throw err;
+      }
     }
   }
 
diff --git a/tests.html b/tests.html
index e0d72ac..311ab14 100644
--- a/tests.html
+++ b/tests.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.4.22 Tests</title>
+    <title>SVR.JS 3.4.23 Tests</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,7 +12,7 @@
     </style>
   </head>
   <body>
-    <h1>SVR.JS 3.4.22 Tests</h1>
+    <h1>SVR.JS 3.4.23 Tests</h1>
     <h2>Directory</h2>
     <iframe src="/testdir" width="50%" height="300px"></iframe>
     <h2>Directory (with query)</h2>
