diff options
author | BlueWall | 2011-02-12 20:42:11 -0500 |
---|---|---|
committer | BlueWall | 2011-02-12 20:42:11 -0500 |
commit | c0e1742d479d4390701688da685892555f28bfbc (patch) | |
tree | 39d717dd9ce4c453898eca2237f9fc2d2879c1d4 /OpenSim/Server | |
parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
parent | Fixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis... (diff) | |
download | opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.zip opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.gz opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.bz2 opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.xz |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 2601d2a..6a23dee 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
110 | DoAgentDelete(request, responsedata, agentID, action, regionID); | 110 | DoAgentDelete(request, responsedata, agentID, action, regionID); |
111 | return responsedata; | 111 | return responsedata; |
112 | } | 112 | } |
113 | else if (method.Equals("QUERYACCESSS")) | 113 | else if (method.Equals("QUERYACCESS")) |
114 | { | 114 | { |
115 | DoQueryAccess(request, responsedata, agentID, regionID); | 115 | DoQueryAccess(request, responsedata, agentID, regionID); |
116 | return responsedata; | 116 | return responsedata; |
@@ -200,6 +200,11 @@ namespace OpenSim.Server.Handlers.Simulation | |||
200 | 200 | ||
201 | // We're behind a proxy | 201 | // We're behind a proxy |
202 | Hashtable headers = (Hashtable)request["headers"]; | 202 | Hashtable headers = (Hashtable)request["headers"]; |
203 | |||
204 | //// DEBUG | ||
205 | //foreach (object o in headers.Keys) | ||
206 | // m_log.DebugFormat("XXX {0} = {1}", o.ToString(), (headers[o] == null? "null" : headers[o].ToString())); | ||
207 | |||
203 | string xff = "X-Forwarded-For"; | 208 | string xff = "X-Forwarded-For"; |
204 | if (headers.ContainsKey(xff.ToLower())) | 209 | if (headers.ContainsKey(xff.ToLower())) |
205 | xff = xff.ToLower(); | 210 | xff = xff.ToLower(); |