diff options
author | Dr Scofield | 2008-05-22 12:59:42 +0000 |
---|---|---|
committer | Dr Scofield | 2008-05-22 12:59:42 +0000 |
commit | a97fa3f43e313848ba6b4cd65840ba8c60ac485f (patch) | |
tree | c0caaaa7fb3532727f24e5b722c639a5c191512f /OpenSim | |
parent | Fix for Mantis 1340. Thanks Melanie! (diff) | |
download | opensim-SC-a97fa3f43e313848ba6b4cd65840ba8c60ac485f.zip opensim-SC-a97fa3f43e313848ba6b4cd65840ba8c60ac485f.tar.gz opensim-SC-a97fa3f43e313848ba6b4cd65840ba8c60ac485f.tar.bz2 opensim-SC-a97fa3f43e313848ba6b4cd65840ba8c60ac485f.tar.xz |
changing more 'raw' HTTP status codes to OSHttpStatusCodes.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Servers/OSHttpStatusCodes.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/OSHttpStatusCodes.cs b/OpenSim/Framework/Servers/OSHttpStatusCodes.cs index 2e001cf..9a04d82 100644 --- a/OpenSim/Framework/Servers/OSHttpStatusCodes.cs +++ b/OpenSim/Framework/Servers/OSHttpStatusCodes.cs | |||
@@ -138,6 +138,8 @@ namespace OpenSim.Framework.Servers | |||
138 | // expressed in one or more Expect header fields cannot be met | 138 | // expressed in one or more Expect header fields cannot be met |
139 | // by the server, the server is awfully sorry about this. | 139 | // by the server, the server is awfully sorry about this. |
140 | ClientErrorExpectationFailed = 417, | 140 | ClientErrorExpectationFailed = 417, |
141 | // 499 Client error: Wildcard error. | ||
142 | ClientErrorJoker = 499, | ||
141 | 143 | ||
142 | // 5xx Server errors (rare) | 144 | // 5xx Server errors (rare) |
143 | // 500 Server error: something really strange and unexpected | 145 | // 500 Server error: something really strange and unexpected |
diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 87ecfee..e0d5972 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -34,6 +34,7 @@ using System.Threading; | |||
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using Nini.Config; | 35 | using Nini.Config; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Servers; | ||
37 | using OpenSim.Region.Environment.Interfaces; | 38 | using OpenSim.Region.Environment.Interfaces; |
38 | using OpenSim.Region.Environment.Scenes; | 39 | using OpenSim.Region.Environment.Scenes; |
39 | 40 | ||
@@ -340,13 +341,13 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest | |||
340 | } | 341 | } |
341 | catch (Exception e) | 342 | catch (Exception e) |
342 | { | 343 | { |
343 | status = 499; | 344 | status = (int)OSHttpStatusCode.ClientErrorJoker; |
344 | response_body = e.Message; | 345 | response_body = e.Message; |
345 | finished = true; | 346 | finished = true; |
346 | return; | 347 | return; |
347 | } | 348 | } |
348 | 349 | ||
349 | status = 200; | 350 | status = (int)OSHttpStatusCode.SuccessOk; |
350 | finished = true; | 351 | finished = true; |
351 | } | 352 | } |
352 | 353 | ||