diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Server/Base/HttpServerBase.cs | |
parent | bad merge? (diff) | |
download | opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Base/HttpServerBase.cs | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index a18cdc1..42a8c57 100644 --- a/OpenSim/Server/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs | |||
@@ -116,20 +116,6 @@ namespace OpenSim.Server.Base | |||
116 | { | 116 | { |
117 | uint https_port = (uint)networkConfig.GetInt("https_port", 0); | 117 | uint https_port = (uint)networkConfig.GetInt("https_port", 0); |
118 | 118 | ||
119 | <<<<<<< HEAD | ||
120 | string cert_path = networkConfig.GetString("cert_path",String.Empty); | ||
121 | if (cert_path == String.Empty) | ||
122 | { | ||
123 | System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start."); | ||
124 | Environment.Exit(1); | ||
125 | } | ||
126 | |||
127 | string cert_pass = networkConfig.GetString("cert_pass",String.Empty); | ||
128 | if (cert_pass == String.Empty) | ||
129 | { | ||
130 | System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start."); | ||
131 | Environment.Exit(1); | ||
132 | ======= | ||
133 | m_log.WarnFormat("[SSL]: External flag is {0}", ssl_external); | 119 | m_log.WarnFormat("[SSL]: External flag is {0}", ssl_external); |
134 | if (!ssl_external) | 120 | if (!ssl_external) |
135 | { | 121 | { |
@@ -152,7 +138,6 @@ namespace OpenSim.Server.Base | |||
152 | { | 138 | { |
153 | m_log.WarnFormat("[SSL]: SSL port is active but no SSL is used because external SSL was requested."); | 139 | m_log.WarnFormat("[SSL]: SSL port is active but no SSL is used because external SSL was requested."); |
154 | MainServer.AddHttpServer(new BaseHttpServer(https_port)); | 140 | MainServer.AddHttpServer(new BaseHttpServer(https_port)); |
155 | >>>>>>> avn/ubitvar | ||
156 | } | 141 | } |
157 | } | 142 | } |
158 | } | 143 | } |