diff options
author | Justin Clark-Casey (justincc) | 2013-07-11 23:02:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-11 23:02:30 +0100 |
commit | 44e9849ed1190dbc29ffa97fa5df286dc9794edb (patch) | |
tree | 427e9033c87ffa2bbedb176acb342c1677d153e0 /OpenSim/Framework | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-44e9849ed1190dbc29ffa97fa5df286dc9794edb.zip opensim-SC_OLD-44e9849ed1190dbc29ffa97fa5df286dc9794edb.tar.gz opensim-SC_OLD-44e9849ed1190dbc29ffa97fa5df286dc9794edb.tar.bz2 opensim-SC_OLD-44e9849ed1190dbc29ffa97fa5df286dc9794edb.tar.xz |
Fix regression where llHTTPRequests which did not get an OK response returned 499 and the exception message in the http_response event rather than the actual response code and body.
This was a regression since commit 831e4c3 (Thu Apr 4 00:36:15 2013)
This commit also adds a regression test for this case, though this currently only works with Mono
This aims to address http://opensimulator.org/mantis/view.php?id=6704
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Util.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index ba6cc75..cafe103 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -141,6 +141,11 @@ namespace OpenSim.Framework | |||
141 | public static FireAndForgetMethod DefaultFireAndForgetMethod = FireAndForgetMethod.SmartThreadPool; | 141 | public static FireAndForgetMethod DefaultFireAndForgetMethod = FireAndForgetMethod.SmartThreadPool; |
142 | public static FireAndForgetMethod FireAndForgetMethod = DefaultFireAndForgetMethod; | 142 | public static FireAndForgetMethod FireAndForgetMethod = DefaultFireAndForgetMethod; |
143 | 143 | ||
144 | public static bool IsPlatformMono | ||
145 | { | ||
146 | get { return Type.GetType("Mono.Runtime") != null; } | ||
147 | } | ||
148 | |||
144 | /// <summary> | 149 | /// <summary> |
145 | /// Gets the name of the directory where the current running executable | 150 | /// Gets the name of the directory where the current running executable |
146 | /// is located | 151 | /// is located |
@@ -1326,7 +1331,7 @@ namespace OpenSim.Framework | |||
1326 | ru = "OSX/Mono"; | 1331 | ru = "OSX/Mono"; |
1327 | else | 1332 | else |
1328 | { | 1333 | { |
1329 | if (Type.GetType("Mono.Runtime") != null) | 1334 | if (IsPlatformMono) |
1330 | ru = "Win/Mono"; | 1335 | ru = "Win/Mono"; |
1331 | else | 1336 | else |
1332 | ru = "Win/.NET"; | 1337 | ru = "Win/.NET"; |