diff options
| author | Jonathan Freedman | 2010-11-05 19:10:02 -0700 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-05 19:10:02 -0700 |
| commit | 4f40374464899dad82abdb9c36ea863ceac0d83f (patch) | |
| tree | a9b116ccca55fb07b8c79ab7f6fdfafc8466d740 /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-4f40374464899dad82abdb9c36ea863ceac0d83f.zip opensim-SC_OLD-4f40374464899dad82abdb9c36ea863ceac0d83f.tar.gz opensim-SC_OLD-4f40374464899dad82abdb9c36ea863ceac0d83f.tar.bz2 opensim-SC_OLD-4f40374464899dad82abdb9c36ea863ceac0d83f.tar.xz | |
Merge git://github.com/opensim/opensim into mantis5110
Diffstat (limited to 'OpenSim/Framework/Servers')
| -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 0c1e5e0..3c58a7d 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 | ||