aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-09-21 20:10:26 +0100
committerMelanie2009-09-21 20:10:26 +0100
commit61aaf3532ae0de94ea39ee7dc4b13a31cd149b40 (patch)
tree408f18f26fedc136129508c310ce280459141042
parentMake the poll service handler call the handler method on incoming requests. (diff)
downloadopensim-SC-61aaf3532ae0de94ea39ee7dc4b13a31cd149b40.zip
opensim-SC-61aaf3532ae0de94ea39ee7dc4b13a31cd149b40.tar.gz
opensim-SC-61aaf3532ae0de94ea39ee7dc4b13a31cd149b40.tar.bz2
opensim-SC-61aaf3532ae0de94ea39ee7dc4b13a31cd149b40.tar.xz
Add X-PollServiceID pseudo-header to the request handling for polls
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index b73557f..5a7f20a 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -262,8 +262,10 @@ namespace OpenSim.Framework.Servers.HttpServer
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);
266 req.Headers["X-PollServiceID"] = psreq.RequestID.ToString();
265 HandleRequest(req, null); 267 HandleRequest(req, null);
266 m_PollServiceManager.Enqueue(new PollServiceHttpRequest(psEvArgs, context, request)); 268 m_PollServiceManager.Enqueue(psreq);
267 //DoHTTPGruntWork(psEvArgs.NoEvents(),new OSHttpResponse(new HttpResponse(context, request))); 269 //DoHTTPGruntWork(psEvArgs.NoEvents(),new OSHttpResponse(new HttpResponse(context, request)));
268 } 270 }
269 else 271 else