diff options
| author | Melanie | 2010-11-02 21:29:02 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-02 21:29:02 +0000 |
| commit | 5eeabb8b4b8137499cf91e4b61133d5f12b9ecdf (patch) | |
| tree | 90488d2377d35c3de7a62647ec9a41a536a125bd /OpenSim/Framework/Servers/HttpServer | |
| parent | Fix sitting and standing up (diff) | |
| parent | Add support for cross-domain AJAX requests to REST console. (diff) | |
| download | opensim-SC_OLD-5eeabb8b4b8137499cf91e4b61133d5f12b9ecdf.zip opensim-SC_OLD-5eeabb8b4b8137499cf91e4b61133d5f12b9ecdf.tar.gz opensim-SC_OLD-5eeabb8b4b8137499cf91e4b61133d5f12b9ecdf.tar.bz2 opensim-SC_OLD-5eeabb8b4b8137499cf91e4b61133d5f12b9ecdf.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index ba8c194..30505f6 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -1450,6 +1450,10 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1450 | if (responsedata.ContainsKey("reusecontext")) | 1450 | if (responsedata.ContainsKey("reusecontext")) |
| 1451 | response.ReuseContext = (bool) responsedata["reusecontext"]; | 1451 | response.ReuseContext = (bool) responsedata["reusecontext"]; |
| 1452 | 1452 | ||
| 1453 | // Cross-Origin Resource Sharing with simple requests | ||
| 1454 | if (responsedata.ContainsKey("access_control_allow_origin")) | ||
| 1455 | response.AddHeader("Access-Control-Allow-Origin", (string)responsedata["access_control_allow_origin"]); | ||
| 1456 | |||
| 1453 | //Even though only one other part of the entire code uses HTTPHandlers, we shouldn't expect this | 1457 | //Even though only one other part of the entire code uses HTTPHandlers, we shouldn't expect this |
| 1454 | //and should check for NullReferenceExceptions | 1458 | //and should check for NullReferenceExceptions |
| 1455 | 1459 | ||