aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-07 12:28:42 +0000
committerJustin Clark-Casey (justincc)2011-12-07 12:28:42 +0000
commite6272b8d56dd7856faf374e7ac29460b4e74f1bb (patch)
tree3f6f291c2cbfdd1339264c20520f0b34a2f62356 /OpenSim/Framework/Servers/HttpServer
parentStop accidentally setting up the UploadTexture caps handler with the same url... (diff)
downloadopensim-SC_OLD-e6272b8d56dd7856faf374e7ac29460b4e74f1bb.zip
opensim-SC_OLD-e6272b8d56dd7856faf374e7ac29460b4e74f1bb.tar.gz
opensim-SC_OLD-e6272b8d56dd7856faf374e7ac29460b4e74f1bb.tar.bz2
opensim-SC_OLD-e6272b8d56dd7856faf374e7ac29460b4e74f1bb.tar.xz
Stop also adding an ordinary http handler when we set up a poll http handler.
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs12
-rw-r--r--OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs4
2 files changed, 5 insertions, 11 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 6bffba5..a8ece79 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -227,21 +227,17 @@ namespace OpenSim.Framework.Servers.HttpServer
227 return new List<string>(m_HTTPHandlers.Keys); 227 return new List<string>(m_HTTPHandlers.Keys);
228 } 228 }
229 229
230 public bool AddPollServiceHTTPHandler(string methodName, GenericHTTPMethod handler, PollServiceEventArgs args) 230 public bool AddPollServiceHTTPHandler(string methodName, PollServiceEventArgs args)
231 { 231 {
232 bool pollHandlerResult = false;
233 lock (m_pollHandlers) 232 lock (m_pollHandlers)
234 { 233 {
235 if (!m_pollHandlers.ContainsKey(methodName)) 234 if (!m_pollHandlers.ContainsKey(methodName))
236 { 235 {
237 m_pollHandlers.Add(methodName,args); 236 m_pollHandlers.Add(methodName, args);
238 pollHandlerResult = true; 237 return true;
239 } 238 }
240 } 239 }
241 240
242 if (pollHandlerResult)
243 return AddHTTPHandler(methodName, handler);
244
245 return false; 241 return false;
246 } 242 }
247 243
@@ -1848,8 +1844,6 @@ namespace OpenSim.Framework.Servers.HttpServer
1848 { 1844 {
1849 lock (m_pollHandlers) 1845 lock (m_pollHandlers)
1850 m_pollHandlers.Remove(path); 1846 m_pollHandlers.Remove(path);
1851
1852 RemoveHTTPHandler(httpMethod, path);
1853 } 1847 }
1854 1848
1855 public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler) 1849 public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler)
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index fd77984..db58f6f 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -77,8 +77,8 @@ namespace OpenSim.Framework.Servers.HttpServer
77 /// true if the handler was successfully registered, false if a handler with the same name already existed. 77 /// true if the handler was successfully registered, false if a handler with the same name already existed.
78 /// </returns> 78 /// </returns>
79 bool AddHTTPHandler(string methodName, GenericHTTPMethod handler); 79 bool AddHTTPHandler(string methodName, GenericHTTPMethod handler);
80 80
81 bool AddPollServiceHTTPHandler(string methodName, GenericHTTPMethod handler, PollServiceEventArgs args); 81 bool AddPollServiceHTTPHandler(string methodName, PollServiceEventArgs args);
82 82
83 /// <summary> 83 /// <summary>
84 /// Adds a LLSD handler, yay. 84 /// Adds a LLSD handler, yay.