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/Inventory | |
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/Inventory')
-rw-r--r-- | OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs index 850bf14..231e32f 100644 --- a/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs +++ b/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Server.Handlers.Inventory | |||
57 | } | 57 | } |
58 | 58 | ||
59 | public override byte[] Handle(string path, Stream request, | 59 | public override byte[] Handle(string path, Stream request, |
60 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 60 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
61 | { | 61 | { |
62 | XmlSerializer xs = new XmlSerializer(typeof (List<InventoryItemBase>)); | 62 | XmlSerializer xs = new XmlSerializer(typeof (List<InventoryItemBase>)); |
63 | List<InventoryItemBase> items = (List<InventoryItemBase>)xs.Deserialize(request); | 63 | List<InventoryItemBase> items = (List<InventoryItemBase>)xs.Deserialize(request); |
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index 899f9c0..9d6f964 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
88 | } | 88 | } |
89 | 89 | ||
90 | public override byte[] Handle(string path, Stream requestData, | 90 | public override byte[] Handle(string path, Stream requestData, |
91 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 91 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
92 | { | 92 | { |
93 | StreamReader sr = new StreamReader(requestData); | 93 | StreamReader sr = new StreamReader(requestData); |
94 | string body = sr.ReadToEnd(); | 94 | string body = sr.ReadToEnd(); |