aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs6
-rw-r--r--OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs6
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 214f936..9a6ef77 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -202,16 +202,14 @@ namespace OpenSim.Framework.Servers.HttpServer
202 if (!m_pollHandlers.ContainsKey(methodName)) 202 if (!m_pollHandlers.ContainsKey(methodName))
203 { 203 {
204 m_pollHandlers.Add(methodName,args); 204 m_pollHandlers.Add(methodName,args);
205 pollHandlerResult = true; 205 pollHandlerResult = true;
206
207 } 206 }
208 } 207 }
209 208
210 if (pollHandlerResult) 209 if (pollHandlerResult)
211 return AddHTTPHandler(methodName, handler); 210 return AddHTTPHandler(methodName, handler);
212 211
213 return false; 212 return false;
214
215 } 213 }
216 214
217 // Note that the agent string is provided simply to differentiate 215 // Note that the agent string is provided simply to differentiate
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index 5ee2045..65b1eb5 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers.HttpServer
47 bool AddAgentHandler(string agent, IHttpAgentHandler handler); 47 bool AddAgentHandler(string agent, IHttpAgentHandler handler);
48 48
49 /// <summary> 49 /// <summary>
50 /// Add a handler for an HTTP request 50 /// Add a handler for an HTTP request.
51 /// </summary> 51 /// </summary>
52 /// 52 ///
53 /// This handler can actually be invoked either as 53 /// This handler can actually be invoked either as
@@ -66,6 +66,10 @@ namespace OpenSim.Framework.Servers.HttpServer
66 /// or 66 /// or
67 /// 67 ///
68 /// http://localhost:9000/object/ 68 /// http://localhost:9000/object/
69 ///
70 /// In addition, the handler invoked by the HTTP server for any request is the one when best matches the request
71 /// URI. So if a handler for "/myapp/" is registered and a request for "/myapp/page" is received, then
72 /// the "/myapp/" handler is invoked if no "/myapp/page" handler exists.
69 /// 73 ///
70 /// <param name="methodName"></param> 74 /// <param name="methodName"></param>
71 /// <param name="handler"></param> 75 /// <param name="handler"></param>