From 04170521f081bf009bf15f76451b119dc280a438 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 21 Sep 2009 14:59:31 +0100
Subject: Add a UUID param to NoEvents in PollServiceEventArgs to make it more
 generic

---
 OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index fed490e..ed387d1 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
     public delegate Hashtable GetEventsMethod(UUID pId, string request);
 
-    public delegate Hashtable NoEventsMethod();
+    public delegate Hashtable NoEventsMethod(UUID pId);
 
     public class PollServiceEventArgs : EventArgs
     {
-- 
cgit v1.1


From bc9e4cfd961e6ed0184165e4f3cbb770b47a8dff Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 21 Sep 2009 18:11:40 +0100
Subject: Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
 even hander delegates.

---
 OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index ed387d1..61cb8aa 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -30,11 +30,11 @@ using System.Collections;
 using OpenMetaverse;
 namespace OpenSim.Framework.Servers.HttpServer
 {
-    public delegate bool HasEventsMethod(UUID pId);
+    public delegate bool HasEventsMethod(UUID requestID, UUID pId);
 
-    public delegate Hashtable GetEventsMethod(UUID pId, string request);
+    public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId, string request);
 
-    public delegate Hashtable NoEventsMethod(UUID pId);
+    public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId);
 
     public class PollServiceEventArgs : EventArgs
     {
-- 
cgit v1.1


From dafe5bf05f6d85d4140a0b733f0fbf9a5c43cf37 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 22 Sep 2009 06:19:02 +0100
Subject: Completely remove the prior implementation of the request event
 handling on poll handlers. Introduce a new delegate on the
 PollServiceEventArgs that allow access to the request headers and body.

---
 OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 61cb8aa..7ed9e5c 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -30,6 +30,7 @@ using System.Collections;
 using OpenMetaverse;
 namespace OpenSim.Framework.Servers.HttpServer
 {
+    public delegate void RequestMethod(UUID requestID, Hashtable request);
     public delegate bool HasEventsMethod(UUID requestID, UUID pId);
 
     public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId, string request);
@@ -41,9 +42,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         public HasEventsMethod HasEvents;
         public GetEventsMethod GetEvents;
         public NoEventsMethod NoEvents;
+        public RequestMethod Request;
         public UUID Id;
-        public PollServiceEventArgs(HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,UUID pId)
+        public PollServiceEventArgs(RequestMethod Request, HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,UUID pId)
         {
+            Request = Request;
             HasEvents = pHasEvents;
             GetEvents = pGetEvents;
             NoEvents = pNoEvents;
-- 
cgit v1.1


From 97c18caa766e2dd72b152b78827ef554f2054f8c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 22 Sep 2009 17:04:34 +0100
Subject: Thank you, Intari, for a patch that implements the missing pieces of
 Http-in and makes the host name for URL generation configurable. Applied with
 changes: llGetSimulatorHostname was not changed, because the change breaks
 existing behavior and carries a data exposure risk. That value needs to be
 configurable, the proposed fixed change is not acceptable.

---
 OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 7ed9e5c..9d512c6 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -44,9 +44,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         public NoEventsMethod NoEvents;
         public RequestMethod Request;
         public UUID Id;
-        public PollServiceEventArgs(RequestMethod Request, HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,UUID pId)
+        public PollServiceEventArgs(RequestMethod pRequest, HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,UUID pId)
         {
-            Request = Request;
+            Request = pRequest;
             HasEvents = pHasEvents;
             GetEvents = pGetEvents;
             NoEvents = pNoEvents;
-- 
cgit v1.1