aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-11-02 00:08:34 +0000
committerUbitUmarov2018-11-02 00:08:34 +0000
commit1ea5116f0026d4afd47bd60158ee6ed122e30e54 (patch)
treefc3af133fe598158b9fff7bd9c63867575b25c31
parentonly main http server listener should run events pool (diff)
downloadopensim-SC-1ea5116f0026d4afd47bd60158ee6ed122e30e54.zip
opensim-SC-1ea5116f0026d4afd47bd60158ee6ed122e30e54.tar.gz
opensim-SC-1ea5116f0026d4afd47bd60158ee6ed122e30e54.tar.bz2
opensim-SC-1ea5116f0026d4afd47bd60158ee6ed122e30e54.tar.xz
forgot about lsl secure urls service.. so lets try another way for now (mantis 8382)
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs4
-rw-r--r--OpenSim/Framework/Servers/MainServer.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index a2f6a11..ec16d7c 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Servers.HttpServer
45 45
46 private Dictionary<int, Queue<PollServiceHttpRequest>> m_bycontext; 46 private Dictionary<int, Queue<PollServiceHttpRequest>> m_bycontext;
47 private BlockingCollection<PollServiceHttpRequest> m_requests = new BlockingCollection<PollServiceHttpRequest>(); 47 private BlockingCollection<PollServiceHttpRequest> m_requests = new BlockingCollection<PollServiceHttpRequest>();
48 private static ConcurrentQueue<PollServiceHttpRequest> m_retryRequests = new ConcurrentQueue<PollServiceHttpRequest>(); 48 private ConcurrentQueue<PollServiceHttpRequest> m_retryRequests = new ConcurrentQueue<PollServiceHttpRequest>();
49 49
50 private uint m_WorkerThreadCount = 0; 50 private uint m_WorkerThreadCount = 0;
51 private Thread[] m_workerThreads; 51 private Thread[] m_workerThreads;
@@ -235,7 +235,7 @@ namespace OpenSim.Framework.Servers.HttpServer
235 continue; 235 continue;
236 } 236 }
237 237
238 Watchdog.UpdateThread(); 238 Watchdog.UpdateThread();
239 239
240 try 240 try
241 { 241 {
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 1190462..523ccba 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -364,7 +364,7 @@ namespace OpenSim.Framework.Servers
364 if (ipaddr != null) 364 if (ipaddr != null)
365 m_Servers[port].ListenIPAddress = ipaddr; 365 m_Servers[port].ListenIPAddress = ipaddr;
366 366
367 m_Servers[port].Start(false, false); 367 m_Servers[port].Start();
368 368
369 return m_Servers[port]; 369 return m_Servers[port];
370 } 370 }