diff options
author | UbitUmarov | 2016-12-08 23:39:55 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-08 23:39:55 +0000 |
commit | 806e75eefbba1a55a3cb22470af3adf8d87b8767 (patch) | |
tree | 7486de06cf4cf258a1a1e5b1ba4db172cf66cfbe /OpenSim | |
parent | Merge branch 'master' into httptests (diff) | |
download | opensim-SC-806e75eefbba1a55a3cb22470af3adf8d87b8767.zip opensim-SC-806e75eefbba1a55a3cb22470af3adf8d87b8767.tar.gz opensim-SC-806e75eefbba1a55a3cb22470af3adf8d87b8767.tar.bz2 opensim-SC-806e75eefbba1a55a3cb22470af3adf8d87b8767.tar.xz |
remove not needed sslport parameter
Diffstat (limited to 'OpenSim')
3 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index bd8b681..01d427e 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -108,7 +108,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
108 | new Dictionary<string, WebSocketRequestDelegate>(); | 108 | new Dictionary<string, WebSocketRequestDelegate>(); |
109 | 109 | ||
110 | protected uint m_port; | 110 | protected uint m_port; |
111 | protected uint m_sslport; | ||
112 | protected bool m_ssl; | 111 | protected bool m_ssl; |
113 | private X509Certificate2 m_cert; | 112 | private X509Certificate2 m_cert; |
114 | protected string m_SSLCommonName = ""; | 113 | protected string m_SSLCommonName = ""; |
@@ -120,9 +119,14 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
120 | 119 | ||
121 | public PollServiceRequestManager PollServiceRequestManager { get; private set; } | 120 | public PollServiceRequestManager PollServiceRequestManager { get; private set; } |
122 | 121 | ||
122 | public string Protocol | ||
123 | { | ||
124 | get { return m_ssl ? "https://" : "http://"; } | ||
125 | } | ||
126 | |||
123 | public uint SSLPort | 127 | public uint SSLPort |
124 | { | 128 | { |
125 | get { return m_sslport; } | 129 | get { return m_port; } |
126 | } | 130 | } |
127 | 131 | ||
128 | public string SSLCommonName | 132 | public string SSLCommonName |
@@ -184,7 +188,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
184 | } | 188 | } |
185 | } | 189 | } |
186 | 190 | ||
187 | public BaseHttpServer(uint port, bool ssl, uint sslport, string CN, string CPath, string CPass) | 191 | public BaseHttpServer(uint port, bool ssl, string CN, string CPath, string CPass) |
188 | { | 192 | { |
189 | m_port = port; | 193 | m_port = port; |
190 | if (ssl) | 194 | if (ssl) |
@@ -200,7 +204,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
200 | m_certCN= ""; | 204 | m_certCN= ""; |
201 | 205 | ||
202 | m_ssl = true; | 206 | m_ssl = true; |
203 | m_sslport = sslport; | ||
204 | load_cert(CPath, CPass); | 207 | load_cert(CPath, CPass); |
205 | 208 | ||
206 | if(!CheckSSLCertHost(CN)) | 209 | if(!CheckSSLCertHost(CN)) |
@@ -224,7 +227,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
224 | if(m_cert.Issuer == m_cert.Subject ) | 227 | if(m_cert.Issuer == m_cert.Subject ) |
225 | m_log.Warn("Self signed certificate. Http clients need to allow this"); | 228 | m_log.Warn("Self signed certificate. Http clients need to allow this"); |
226 | m_ssl = true; | 229 | m_ssl = true; |
227 | m_sslport = port; | ||
228 | } | 230 | } |
229 | else | 231 | else |
230 | m_ssl = false; | 232 | m_ssl = false; |
@@ -2101,7 +2103,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
2101 | catch (Exception e) | 2103 | catch (Exception e) |
2102 | { | 2104 | { |
2103 | m_log.Error("[BASE HTTP SERVER]: Error - " + e.Message); | 2105 | m_log.Error("[BASE HTTP SERVER]: Error - " + e.Message); |
2104 | m_log.Error("[BASE HTTP SERVER]: Tip: Do you have permission to listen on port " + m_port + ", " + m_sslport + "?"); | 2106 | m_log.Error("[BASE HTTP SERVER]: Tip: Do you have permission to listen on port " + m_port + "?"); |
2105 | 2107 | ||
2106 | // We want this exception to halt the entire server since in current configurations we aren't too | 2108 | // We want this exception to halt the entire server since in current configurations we aren't too |
2107 | // useful without inbound HTTP. | 2109 | // useful without inbound HTTP. |
diff --git a/OpenSim/Region/Application/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs index 77b0138..09940b5 100644 --- a/OpenSim/Region/Application/RegionApplicationBase.cs +++ b/OpenSim/Region/Application/RegionApplicationBase.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim | |||
70 | Initialize(); | 70 | Initialize(); |
71 | 71 | ||
72 | uint mainport = m_networkServersInfo.HttpListenerPort; | 72 | uint mainport = m_networkServersInfo.HttpListenerPort; |
73 | uint mainSSLport =m_networkServersInfo.httpSSLPort; | 73 | uint mainSSLport = m_networkServersInfo.httpSSLPort; |
74 | 74 | ||
75 | if (m_networkServersInfo.HttpUsesSSL && (mainport == mainSSLport)) | 75 | if (m_networkServersInfo.HttpUsesSSL && (mainport == mainSSLport)) |
76 | { | 76 | { |
@@ -81,11 +81,10 @@ namespace OpenSim | |||
81 | { | 81 | { |
82 | m_httpServer = new BaseHttpServer( | 82 | m_httpServer = new BaseHttpServer( |
83 | mainSSLport, m_networkServersInfo.HttpUsesSSL, | 83 | mainSSLport, m_networkServersInfo.HttpUsesSSL, |
84 | mainSSLport, m_networkServersInfo.HttpSSLCN, | 84 | m_networkServersInfo.HttpSSLCN, |
85 | m_networkServersInfo.HttpSSLCertPath, m_networkServersInfo.HttpSSLCNCertPass); | 85 | m_networkServersInfo.HttpSSLCertPath, m_networkServersInfo.HttpSSLCNCertPass); |
86 | m_httpServer.Start(true,true); | 86 | m_httpServer.Start(true,true); |
87 | MainServer.AddHttpServer(m_httpServer); | 87 | MainServer.AddHttpServer(m_httpServer); |
88 | |||
89 | } | 88 | } |
90 | 89 | ||
91 | // unsecure main server | 90 | // unsecure main server |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs index 507d9b8..54af246 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs | |||
@@ -59,13 +59,12 @@ namespace OpenSim.Region.ClientStack.Linden.Tests | |||
59 | base.SetUp(); | 59 | base.SetUp(); |
60 | 60 | ||
61 | uint port = 9999; | 61 | uint port = 9999; |
62 | uint sslPort = 9998; | ||
63 | 62 | ||
64 | // This is an unfortunate bit of clean up we have to do because MainServer manages things through static | 63 | // This is an unfortunate bit of clean up we have to do because MainServer manages things through static |
65 | // variables and the VM is not restarted between tests. | 64 | // variables and the VM is not restarted between tests. |
66 | MainServer.RemoveHttpServer(port); | 65 | MainServer.RemoveHttpServer(port); |
67 | 66 | ||
68 | BaseHttpServer server = new BaseHttpServer(port, false, sslPort, "","",""); | 67 | BaseHttpServer server = new BaseHttpServer(port, false, "","",""); |
69 | MainServer.AddHttpServer(server); | 68 | MainServer.AddHttpServer(server); |
70 | MainServer.Instance = server; | 69 | MainServer.Instance = server; |
71 | 70 | ||