diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/RegionApplicationBase.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs | 3 |
2 files changed, 3 insertions, 5 deletions
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 | ||