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/Region/OptionalModules | |
| 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/Region/OptionalModules')
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index a5bba4f..5323a95 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
| @@ -309,7 +309,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
| 309 | caps.RegisterHandler("ProvisionVoiceAccountRequest", | 309 | caps.RegisterHandler("ProvisionVoiceAccountRequest", |
| 310 | new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, | 310 | new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, |
| 311 | delegate(string request, string path, string param, | 311 | delegate(string request, string path, string param, |
| 312 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 312 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 313 | { | 313 | { |
| 314 | return ProvisionVoiceAccountRequest(scene, request, path, param, | 314 | return ProvisionVoiceAccountRequest(scene, request, path, param, |
| 315 | agentID, caps); | 315 | agentID, caps); |
| @@ -317,7 +317,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
| 317 | caps.RegisterHandler("ParcelVoiceInfoRequest", | 317 | caps.RegisterHandler("ParcelVoiceInfoRequest", |
| 318 | new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, | 318 | new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, |
| 319 | delegate(string request, string path, string param, | 319 | delegate(string request, string path, string param, |
| 320 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 320 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 321 | { | 321 | { |
| 322 | return ParcelVoiceInfoRequest(scene, request, path, param, | 322 | return ParcelVoiceInfoRequest(scene, request, path, param, |
| 323 | agentID, caps); | 323 | agentID, caps); |
| @@ -325,7 +325,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
| 325 | caps.RegisterHandler("ChatSessionRequest", | 325 | caps.RegisterHandler("ChatSessionRequest", |
| 326 | new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath, | 326 | new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath, |
| 327 | delegate(string request, string path, string param, | 327 | delegate(string request, string path, string param, |
| 328 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 328 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 329 | { | 329 | { |
| 330 | return ChatSessionRequest(scene, request, path, param, | 330 | return ChatSessionRequest(scene, request, path, param, |
| 331 | agentID, caps); | 331 | agentID, caps); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 534bf92..70e2f7e 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
| @@ -421,7 +421,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
| 421 | caps.RegisterHandler("ProvisionVoiceAccountRequest", | 421 | caps.RegisterHandler("ProvisionVoiceAccountRequest", |
| 422 | new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, | 422 | new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, |
| 423 | delegate(string request, string path, string param, | 423 | delegate(string request, string path, string param, |
| 424 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 424 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 425 | { | 425 | { |
| 426 | return ProvisionVoiceAccountRequest(scene, request, path, param, | 426 | return ProvisionVoiceAccountRequest(scene, request, path, param, |
| 427 | agentID, caps); | 427 | agentID, caps); |
| @@ -429,7 +429,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
| 429 | caps.RegisterHandler("ParcelVoiceInfoRequest", | 429 | caps.RegisterHandler("ParcelVoiceInfoRequest", |
| 430 | new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, | 430 | new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, |
| 431 | delegate(string request, string path, string param, | 431 | delegate(string request, string path, string param, |
| 432 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 432 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 433 | { | 433 | { |
| 434 | return ParcelVoiceInfoRequest(scene, request, path, param, | 434 | return ParcelVoiceInfoRequest(scene, request, path, param, |
| 435 | agentID, caps); | 435 | agentID, caps); |
| @@ -437,7 +437,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
| 437 | caps.RegisterHandler("ChatSessionRequest", | 437 | caps.RegisterHandler("ChatSessionRequest", |
| 438 | new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath, | 438 | new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath, |
| 439 | delegate(string request, string path, string param, | 439 | delegate(string request, string path, string param, |
| 440 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 440 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 441 | { | 441 | { |
| 442 | return ChatSessionRequest(scene, request, path, param, | 442 | return ChatSessionRequest(scene, request, path, param, |
| 443 | agentID, caps); | 443 | agentID, caps); |
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs index f47d9c7..550b5d4 100644 --- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs +++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs | |||
| @@ -56,7 +56,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView | |||
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | public override byte[] Handle(string path, Stream requestData, | 58 | public override byte[] Handle(string path, Stream requestData, |
| 59 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 59 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 60 | { | 60 | { |
| 61 | httpResponse.ContentType = "image/jpeg"; | 61 | httpResponse.ContentType = "image/jpeg"; |
| 62 | 62 | ||