ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Added a streamhandler that does streams both in and out

Browse Source 
* The RestDeserialisehandler now does streams and returns an object instead of string
This commit is contained in:
lbsa71
2007-10-31 12:45:03 +00:00
parent dbcab80520
commit 0d528e1d22
6 changed files with 93 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -43,7 +43,7 @@ namespace OpenSim.Framework.Servers
protected Thread m_workerThread;
protected HttpListener m_httpListener;
protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
protected Dictionary<string, IStreamHandler> m_streamHandlers = new Dictionary<string, IStreamHandler>();
protected Dictionary<string, IRequestHandler> m_streamHandlers = new Dictionary<string, IRequestHandler>();
protected int m_port;
protected bool m_firstcaps = true;
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Servers
m_port = port;
}
public void AddStreamHandler(IStreamHandler handler)
public void AddStreamHandler(IRequestHandler handler)
{
string httpMethod = handler.HttpMethod;
string path = handler.Path;
@@ -97,14 +97,32 @@ namespace OpenSim.Framework.Servers
string path = request.RawUrl;
string handlerKey = GetHandlerKey(request.HttpMethod, path);
IStreamHandler streamHandler;
IRequestHandler requestHandler;
if (TryGetStreamHandler(handlerKey, out streamHandler))
if (TryGetStreamHandler(handlerKey, out requestHandler))
{
byte[] buffer = streamHandler.Handle(path, request.InputStream);
request.InputStream.Close();
// Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
byte[] buffer;
if (requestHandler is IStreamedRequestHandler)
{
IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler;
buffer = streamedRequestHandler.Handle(path, request.InputStream);
response.ContentType = streamHandler.ContentType;
}
else
{
IStreamHandler streamHandler = (IStreamHandler)requestHandler;
using (MemoryStream memoryStream = new MemoryStream())
{
streamHandler.Handle(path, request.InputStream, memoryStream);
memoryStream.Flush();
buffer = memoryStream.ToArray();
}
}
request.InputStream.Close();
response.ContentType = requestHandler.ContentType;
response.ContentLength64 = buffer.LongLength;
response.OutputStream.Write(buffer, 0, buffer.Length);
response.OutputStream.Close();
@@ -115,7 +133,7 @@ namespace OpenSim.Framework.Servers
}
}
private bool TryGetStreamHandler(string handlerKey, out IStreamHandler streamHandler)
private bool TryGetStreamHandler(string handlerKey, out IRequestHandler streamHandler)
{
string bestMatch = null;