changing more 'raw' HTTP status codes to OSHttpStatusCodes.

0.6.0-stable
Dr Scofield 2008-05-22 12:59:42 +00:00
parent 9915fa13fb
commit a97fa3f43e
2 changed files with 5 additions and 2 deletions

View File

@ -138,6 +138,8 @@ namespace OpenSim.Framework.Servers
// expressed in one or more Expect header fields cannot be met // expressed in one or more Expect header fields cannot be met
// by the server, the server is awfully sorry about this. // by the server, the server is awfully sorry about this.
ClientErrorExpectationFailed = 417, ClientErrorExpectationFailed = 417,
// 499 Client error: Wildcard error.
ClientErrorJoker = 499,
// 5xx Server errors (rare) // 5xx Server errors (rare)
// 500 Server error: something really strange and unexpected // 500 Server error: something really strange and unexpected

View File

@ -34,6 +34,7 @@ using System.Threading;
using libsecondlife; using libsecondlife;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
@ -340,13 +341,13 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
} }
catch (Exception e) catch (Exception e)
{ {
status = 499; status = (int)OSHttpStatusCode.ClientErrorJoker;
response_body = e.Message; response_body = e.Message;
finished = true; finished = true;
return; return;
} }
status = 200; status = (int)OSHttpStatusCode.SuccessOk;
finished = true; finished = true;
} }