diff options
| author | Melanie | 2011-02-19 01:59:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-19 01:59:49 +0000 |
| commit | 4834b476798cce715d0b5b286a6f20bc577bdabd (patch) | |
| tree | 5bf15fa7978daaff116147838f84e4915bca1777 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | Add needed dummy to sample money (diff) | |
| parent | Remove test T020_TestMakeRootAgent() which hasn't been active for ages anyway (diff) | |
| download | opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.zip opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.gz opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.bz2 opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 4c35132..1d05b02 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -785,7 +785,19 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 785 | if (methodWasFound) | 785 | if (methodWasFound) |
| 786 | { | 786 | { |
| 787 | xmlRprcRequest.Params.Add(request.Url); // Param[2] | 787 | xmlRprcRequest.Params.Add(request.Url); // Param[2] |
| 788 | xmlRprcRequest.Params.Add(request.Headers.Get("X-Forwarded-For")); // Param[3] | 788 | |
| 789 | string xff = "X-Forwarded-For"; | ||
| 790 | string xfflower = xff.ToLower(); | ||
| 791 | foreach (string s in request.Headers.AllKeys) | ||
| 792 | { | ||
| 793 | if (s != null && s.Equals(xfflower)) | ||
| 794 | { | ||
| 795 | xff = xfflower; | ||
| 796 | break; | ||
| 797 | } | ||
| 798 | } | ||
| 799 | xmlRprcRequest.Params.Add(request.Headers.Get(xff)); // Param[3] | ||
| 800 | |||
| 789 | 801 | ||
| 790 | try | 802 | try |
| 791 | { | 803 | { |