diff options
author | Justin Clark-Casey (justincc) | 2011-12-05 20:44:20 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-12-05 20:44:20 +0000 |
commit | 4567555c49cb560dd6f109bbfec42086af3de56f (patch) | |
tree | bfb0a6fd21d2070940399c0e36dc7d0de1e7eb0d /OpenSim/Server/Handlers/Hypergrid | |
parent | For the GetTexture capability, if a data range is requested that covers the w... (diff) | |
download | opensim-SC_OLD-4567555c49cb560dd6f109bbfec42086af3de56f.zip opensim-SC_OLD-4567555c49cb560dd6f109bbfec42086af3de56f.tar.gz opensim-SC_OLD-4567555c49cb560dd6f109bbfec42086af3de56f.tar.bz2 opensim-SC_OLD-4567555c49cb560dd6f109bbfec42086af3de56f.tar.xz |
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs index 56f130e..661507e 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
61 | } | 61 | } |
62 | 62 | ||
63 | public override byte[] Handle(string path, Stream requestData, | 63 | public override byte[] Handle(string path, Stream requestData, |
64 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 64 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
65 | { | 65 | { |
66 | StreamReader sr = new StreamReader(requestData); | 66 | StreamReader sr = new StreamReader(requestData); |
67 | string body = sr.ReadToEnd(); | 67 | string body = sr.ReadToEnd(); |
diff --git a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs index 4accea1..f306b1c 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs | |||
@@ -63,12 +63,12 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
63 | } | 63 | } |
64 | 64 | ||
65 | public override byte[] Handle(string path, Stream requestData, | 65 | public override byte[] Handle(string path, Stream requestData, |
66 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 66 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
67 | { | 67 | { |
68 | return OKResponse(httpResponse); | 68 | return OKResponse(httpResponse); |
69 | } | 69 | } |
70 | 70 | ||
71 | private byte[] OKResponse(OSHttpResponse httpResponse) | 71 | private byte[] OKResponse(IOSHttpResponse httpResponse) |
72 | { | 72 | { |
73 | m_log.Debug("[HELO]: hi, GET was called"); | 73 | m_log.Debug("[HELO]: hi, GET was called"); |
74 | httpResponse.AddHeader("X-Handlers-Provided", m_HandlersType); | 74 | httpResponse.AddHeader("X-Handlers-Provided", m_HandlersType); |
@@ -92,12 +92,12 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
92 | } | 92 | } |
93 | 93 | ||
94 | public override byte[] Handle(string path, Stream requestData, | 94 | public override byte[] Handle(string path, Stream requestData, |
95 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 95 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
96 | { | 96 | { |
97 | return OKResponse(httpResponse); | 97 | return OKResponse(httpResponse); |
98 | } | 98 | } |
99 | 99 | ||
100 | private byte[] OKResponse(OSHttpResponse httpResponse) | 100 | private byte[] OKResponse(IOSHttpResponse httpResponse) |
101 | { | 101 | { |
102 | m_log.Debug("[HELO]: hi, HEAD was called"); | 102 | m_log.Debug("[HELO]: hi, HEAD was called"); |
103 | httpResponse.AddHeader("X-Handlers-Provided", m_HandlersType); | 103 | httpResponse.AddHeader("X-Handlers-Provided", m_HandlersType); |