diff options
| author | Marck | 2010-09-11 11:59:07 +0200 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-18 02:24:04 +0100 |
| commit | cd42cdcc899de30f72727c6845a4d173f2d9cc8a (patch) | |
| tree | 32640a1f369ddb92c3f0c14fa1c13e975776ebc1 | |
| parent | Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurliman (diff) | |
| download | opensim-SC_OLD-cd42cdcc899de30f72727c6845a4d173f2d9cc8a.zip opensim-SC_OLD-cd42cdcc899de30f72727c6845a4d173f2d9cc8a.tar.gz opensim-SC_OLD-cd42cdcc899de30f72727c6845a4d173f2d9cc8a.tar.bz2 opensim-SC_OLD-cd42cdcc899de30f72727c6845a4d173f2d9cc8a.tar.xz | |
REST Console delivers responses with content type text/xml instead of text/plain.
Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload.
| -rw-r--r-- | OpenSim/Framework/Console/RemoteConsole.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index c038aac..7eb289b 100644 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
| @@ -288,7 +288,7 @@ namespace OpenSim.Framework.Console | |||
| 288 | 288 | ||
| 289 | reply["str_response_string"] = xmldoc.InnerXml; | 289 | reply["str_response_string"] = xmldoc.InnerXml; |
| 290 | reply["int_response_code"] = 200; | 290 | reply["int_response_code"] = 200; |
| 291 | reply["content_type"] = "text/plain"; | 291 | reply["content_type"] = "text/xml"; |
| 292 | 292 | ||
| 293 | return reply; | 293 | return reply; |
| 294 | } | 294 | } |
| @@ -343,7 +343,7 @@ namespace OpenSim.Framework.Console | |||
| 343 | 343 | ||
| 344 | reply["str_response_string"] = xmldoc.InnerXml; | 344 | reply["str_response_string"] = xmldoc.InnerXml; |
| 345 | reply["int_response_code"] = 200; | 345 | reply["int_response_code"] = 200; |
| 346 | reply["content_type"] = "text/plain"; | 346 | reply["content_type"] = "text/xml"; |
| 347 | 347 | ||
| 348 | return reply; | 348 | return reply; |
| 349 | } | 349 | } |