1 files changed, 21 insertions, 18 deletions

diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 954783c..44ef124 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -56,15 +56,16 @@ namespace OpenSim.Server.Base
 
             if (networkConfig == null)
             {
-                System.Console.WriteLine("Section 'Network' not found, server can't start");
-                Thread.CurrentThread.Abort();
+                System.Console.WriteLine("ERROR: Section [Network] not found, server can't start");
+                Environment.Exit(1);
             }
 
             uint port = (uint)networkConfig.GetInt("port", 0);
 
             if (port == 0)
             {
-                Thread.CurrentThread.Abort();
+                System.Console.WriteLine("ERROR: No 'port' entry found in [Network].  Server can't start");
+                Environment.Exit(1);
             }
 
             bool ssl_main = networkConfig.GetBoolean("https_main",false);
@@ -83,23 +84,24 @@ namespace OpenSim.Server.Base
             // Then, check for https settings and ADD a server to
             // m_Servers
             //
-            if ( !ssl_main )
+            if (!ssl_main)
             {
                 httpServer = new BaseHttpServer(port);
             }
             else
             {
                 string cert_path = networkConfig.GetString("cert_path",String.Empty);
-                if ( cert_path == String.Empty )
+                if (cert_path == String.Empty)
                 {
-                    System.Console.WriteLine("Path to X509 certificate is missing, server can't start.");
-                    Thread.CurrentThread.Abort();
+                    System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start.");
+                    Environment.Exit(1);
                 }
+
                 string cert_pass = networkConfig.GetString("cert_pass",String.Empty);
-                if ( cert_pass == String.Empty )
+                if (cert_pass == String.Empty)
                 {
-                    System.Console.WriteLine("Password for X509 certificate is missing, server can't start.");
-                    Thread.CurrentThread.Abort();
+                    System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start.");
+                    Environment.Exit(1);
                 }
 
                 httpServer = new BaseHttpServer(port, ssl_main, cert_path, cert_pass);
@@ -109,21 +111,22 @@ namespace OpenSim.Server.Base
             MainServer.Instance = httpServer;
 
             // If https_listener = true, then add an ssl listener on the https_port...
-            if ( ssl_listener == true ) {
-
+            if (ssl_listener == true) 
+            {
                 uint https_port = (uint)networkConfig.GetInt("https_port", 0);
 
                 string cert_path = networkConfig.GetString("cert_path",String.Empty);
-                if ( cert_path == String.Empty )
+                if (cert_path == String.Empty)
                 {
-                    System.Console.WriteLine("Path to X509 certificate is missing, server can't start.");
-                    Thread.CurrentThread.Abort();
+                    System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start.");
+                    Environment.Exit(1);
                 }
+
                 string cert_pass = networkConfig.GetString("cert_pass",String.Empty);
-                if ( cert_pass == String.Empty )
+                if (cert_pass == String.Empty)
                 {
-                    System.Console.WriteLine("Password for X509 certificate is missing, server can't start.");
-                    Thread.CurrentThread.Abort();
+                    System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start.");
+                    Environment.Exit(1);
                 }
 
                 MainServer.AddHttpServer(new BaseHttpServer(https_port, ssl_listener, cert_path, cert_pass));