1 files changed, 36 insertions, 3 deletions

diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs
index c523143..7549f08 100644
--- a/OpenSim/Framework/Servers/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequest.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.Servers
         private IPEndPoint _ipEndPoint;
 
         private HttpRequest _request;
-        // private HttpClientContext _context;
+        private HttpClientContext _context;
 
         public string[] AcceptTypes
         {
@@ -152,11 +152,28 @@ namespace OpenSim.Framework.Servers
             get { return _ipEndPoint; }
         }
 
-        public HttpRequest HttpRequest
+
+        internal HttpRequest HttpRequest
         {
             get { return _request; }
         }
 
+        internal HttpClientContext HttpClientContext
+        {
+            get { return _context; }
+        }
+        
+        /// <summary>
+        /// Internal whiteboard for handlers to store temporary stuff
+        /// into.
+        /// </summary>
+        internal Dictionary<string, object> Whiteboard
+        {
+            get { return _whiteboard; }
+        }
+        private Dictionary<string, object> _whiteboard = new Dictionary<string, object>();
+
+
         public OSHttpRequest()
         {
         }
@@ -185,7 +202,7 @@ namespace OpenSim.Framework.Servers
 
         public OSHttpRequest(HttpClientContext context, HttpRequest req)
         {
-            // _context = context;
+            _context = context;
             _request = req;
 
             _acceptTypes = req.AcceptTypes;
@@ -215,5 +232,21 @@ namespace OpenSim.Framework.Servers
             // _isSecureConnection = req.IsSecureConnection;
             // _isAuthenticated = req.IsAuthenticated;
         }
+
+        public override string ToString()
+        {
+            StringBuilder me = new StringBuilder();
+            me.Append(String.Format("OSHttpRequest: {0} {1}\n", HttpMethod, RawUrl));
+            foreach (string k in Headers.AllKeys)
+            {
+                me.Append(String.Format("    {0}: {1}\n", k, Headers[k]));
+            }
+            if (null != RemoteIPEndPoint)
+            {
+                me.Append(String.Format("    IP: {0}\n", RemoteIPEndPoint.ToString()));
+            }
+
+            return me.ToString();
+        }
     }
 }