diff options
Diffstat (limited to 'OpenSim/Server/Base/HttpServerBase.cs')
-rw-r--r-- | OpenSim/Server/Base/HttpServerBase.cs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index 5dc9eed..44ef124 100644 --- a/OpenSim/Server/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs | |||
@@ -84,22 +84,23 @@ namespace OpenSim.Server.Base | |||
84 | // Then, check for https settings and ADD a server to | 84 | // Then, check for https settings and ADD a server to |
85 | // m_Servers | 85 | // m_Servers |
86 | // | 86 | // |
87 | if ( !ssl_main ) | 87 | if (!ssl_main) |
88 | { | 88 | { |
89 | httpServer = new BaseHttpServer(port); | 89 | httpServer = new BaseHttpServer(port); |
90 | } | 90 | } |
91 | else | 91 | else |
92 | { | 92 | { |
93 | string cert_path = networkConfig.GetString("cert_path",String.Empty); | 93 | string cert_path = networkConfig.GetString("cert_path",String.Empty); |
94 | if ( cert_path == String.Empty ) | 94 | if (cert_path == String.Empty) |
95 | { | 95 | { |
96 | System.Console.WriteLine("Path to X509 certificate is missing, server can't start."); | 96 | System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start."); |
97 | Environment.Exit(1); | 97 | Environment.Exit(1); |
98 | } | 98 | } |
99 | |||
99 | string cert_pass = networkConfig.GetString("cert_pass",String.Empty); | 100 | string cert_pass = networkConfig.GetString("cert_pass",String.Empty); |
100 | if ( cert_pass == String.Empty ) | 101 | if (cert_pass == String.Empty) |
101 | { | 102 | { |
102 | System.Console.WriteLine("Password for X509 certificate is missing, server can't start."); | 103 | System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start."); |
103 | Environment.Exit(1); | 104 | Environment.Exit(1); |
104 | } | 105 | } |
105 | 106 | ||
@@ -110,20 +111,21 @@ namespace OpenSim.Server.Base | |||
110 | MainServer.Instance = httpServer; | 111 | MainServer.Instance = httpServer; |
111 | 112 | ||
112 | // If https_listener = true, then add an ssl listener on the https_port... | 113 | // If https_listener = true, then add an ssl listener on the https_port... |
113 | if ( ssl_listener == true ) { | 114 | if (ssl_listener == true) |
114 | 115 | { | |
115 | uint https_port = (uint)networkConfig.GetInt("https_port", 0); | 116 | uint https_port = (uint)networkConfig.GetInt("https_port", 0); |
116 | 117 | ||
117 | string cert_path = networkConfig.GetString("cert_path",String.Empty); | 118 | string cert_path = networkConfig.GetString("cert_path",String.Empty); |
118 | if ( cert_path == String.Empty ) | 119 | if (cert_path == String.Empty) |
119 | { | 120 | { |
120 | System.Console.WriteLine("Path to X509 certificate is missing, server can't start."); | 121 | System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start."); |
121 | Environment.Exit(1); | 122 | Environment.Exit(1); |
122 | } | 123 | } |
124 | |||
123 | string cert_pass = networkConfig.GetString("cert_pass",String.Empty); | 125 | string cert_pass = networkConfig.GetString("cert_pass",String.Empty); |
124 | if ( cert_pass == String.Empty ) | 126 | if (cert_pass == String.Empty) |
125 | { | 127 | { |
126 | System.Console.WriteLine("Password for X509 certificate is missing, server can't start."); | 128 | System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start."); |
127 | Environment.Exit(1); | 129 | Environment.Exit(1); |
128 | } | 130 | } |
129 | 131 | ||