diff options
| author | Justin Clark-Casey (justincc) | 2010-09-04 01:38:11 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-04 01:38:11 +0100 |
| commit | c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974 (patch) | |
| tree | 9e0db9a67ff4b8c9a8c1d938f6407bcee0f7cb42 /OpenSim/Framework/Servers | |
| parent | Move code that allows llGiveInvetory() to move item into appropriate system f... (diff) | |
| parent | Added XFF header processing. Untested, for lack of proxy. (diff) | |
| download | opensim-SC-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.zip opensim-SC-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.tar.gz opensim-SC-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.tar.bz2 opensim-SC-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 95c3e6c..d20f8c9 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | using System; | 28 | using System; |
| 29 | using System.Collections; | 29 | using System.Collections; |
| 30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
| 31 | using System.Collections.Specialized; | ||
| 31 | using System.IO; | 32 | using System.IO; |
| 32 | using System.Net; | 33 | using System.Net; |
| 33 | using System.Net.Sockets; | 34 | using System.Net.Sockets; |
| @@ -737,6 +738,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 737 | if (methodWasFound) | 738 | if (methodWasFound) |
| 738 | { | 739 | { |
| 739 | xmlRprcRequest.Params.Add(request.Url); // Param[2] | 740 | xmlRprcRequest.Params.Add(request.Url); // Param[2] |
| 741 | xmlRprcRequest.Params.Add(request.Headers.Get("X-Forwarded-For")); // Param[3] | ||
| 740 | 742 | ||
| 741 | try | 743 | try |
| 742 | { | 744 | { |