diff options
| author | Melanie | 2010-11-02 22:58:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-02 22:58:33 +0000 |
| commit | 26f12f479f17aef37451fb30f9b1de376c8676ac (patch) | |
| tree | ecaf084da6ca491301450c0f8a8460a8b1dc981a /OpenSim/Framework/Servers/HttpServer | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Fix default club feet (diff) | |
| download | opensim-SC_OLD-26f12f479f17aef37451fb30f9b1de376c8676ac.zip opensim-SC_OLD-26f12f479f17aef37451fb30f9b1de376c8676ac.tar.gz opensim-SC_OLD-26f12f479f17aef37451fb30f9b1de376c8676ac.tar.bz2 opensim-SC_OLD-26f12f479f17aef37451fb30f9b1de376c8676ac.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -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 | ||