From d725d1208bfbeae02f181cc6731f5a98dc7fce6d Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Mon, 19 May 2008 11:38:35 +0000 Subject: adding OSHttpRequest and OSHttpResponse which wrap HttpListenerRequest and HttpListenerResponse respectively. enhancing IStreamHandler and IStreamedHandler interfaces so that OSHttp{Request,Response} get passed in, allowing RestHandlers to set response status code, redirections, etc. --- OpenSim/Grid/AssetServer/RestService.cs | 7 +++++-- OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'OpenSim/Grid') diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index fcf99cd..c776c36 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs @@ -27,6 +27,7 @@ using System; using System.IO; +using System.Net; using System.Reflection; using System.Text; using System.Xml; @@ -59,7 +60,8 @@ namespace OpenSim.Grid.AssetServer m_assetProvider = assetProvider; } - public override byte[] Handle(string path, Stream request) + public override byte[] Handle(string path, Stream request, + OSHttpRequest httpRequest, OSHttpResponse httpResponse) { string param = GetParam(path); byte[] result = new byte[] {}; @@ -121,7 +123,8 @@ namespace OpenSim.Grid.AssetServer private OpenAsset_Main m_assetManager; private IAssetProvider m_assetProvider; - public override byte[] Handle(string path, Stream request) + public override byte[] Handle(string path, Stream request, + OSHttpRequest httpRequest, OSHttpResponse httpResponse) { string param = GetParam(path); diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs index a0aeacc..a5b256d 100644 --- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs +++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs @@ -27,6 +27,7 @@ using System; using System.IO; +using System.Net; using System.Reflection; using libsecondlife; using log4net; @@ -51,7 +52,8 @@ namespace OpenSim.Grid.MessagingServer } - public override byte[] Handle(string path, Stream request) + public override byte[] Handle(string path, Stream request, + OSHttpRequest httpRequest, OSHttpResponse httpResponse) { string param = GetParam(path); byte[] result = new byte[] {}; @@ -84,7 +86,8 @@ namespace OpenSim.Grid.MessagingServer { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public override byte[] Handle(string path, Stream request) + public override byte[] Handle(string path, Stream request, + OSHttpRequest httpRequest, OSHttpResponse httpResponse) { string param = GetParam(path); -- cgit v1.1