aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer
diff options
context:
space:
mode:
authorMelanie2009-09-22 05:13:50 +0100
committerMelanie2009-09-22 05:13:50 +0100
commit06871d51dd47cd59185e2123f8235b4d79aee02c (patch)
treec2c43162e51565f95e75d603129193cbf3626f9a /OpenSim/Framework/Servers/HttpServer
parentAdd the headers collection to the keysvals for HTT requests (diff)
downloadopensim-SC_OLD-06871d51dd47cd59185e2123f8235b4d79aee02c.zip
opensim-SC_OLD-06871d51dd47cd59185e2123f8235b4d79aee02c.tar.gz
opensim-SC_OLD-06871d51dd47cd59185e2123f8235b4d79aee02c.tar.bz2
opensim-SC_OLD-06871d51dd47cd59185e2123f8235b4d79aee02c.tar.xz
Disable the handler execution for poll services until the ramifications
can be studied
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 5d83e34..5c9fa9b 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -260,11 +260,11 @@ namespace OpenSim.Framework.Servers.HttpServer
260 PollServiceEventArgs psEvArgs; 260 PollServiceEventArgs psEvArgs;
261 if (TryGetPollServiceHTTPHandler(request.UriPath.ToString(), out psEvArgs)) 261 if (TryGetPollServiceHTTPHandler(request.UriPath.ToString(), out psEvArgs))
262 { 262 {
263 OSHttpRequest req = new OSHttpRequest(context, request); 263// OSHttpRequest req = new OSHttpRequest(context, request);
264 264
265 PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request); 265 PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request);
266 req.Headers["X-PollServiceID"] = psreq.RequestID.ToString(); 266// req.Headers["X-PollServiceID"] = psreq.RequestID.ToString();
267 HandleRequest(req, null); 267// HandleRequest(req, null);
268 m_PollServiceManager.Enqueue(psreq); 268 m_PollServiceManager.Enqueue(psreq);
269 //DoHTTPGruntWork(psEvArgs.NoEvents(),new OSHttpResponse(new HttpResponse(context, request))); 269 //DoHTTPGruntWork(psEvArgs.NoEvents(),new OSHttpResponse(new HttpResponse(context, request)));
270 } 270 }