aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorUbitUmarov2014-10-24 02:12:30 +0100
committerUbitUmarov2014-10-24 02:12:30 +0100
commitfd79f75ba6766e1edc196a73dd05fc5f806f82b2 (patch)
tree3ead04ca86d81e6608308782945aec6490fedfa9 /OpenSim/Framework/Servers
parentremove some Xengine errors on scripted object delete (diff)
downloadopensim-SC_OLD-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.zip
opensim-SC_OLD-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.tar.gz
opensim-SC_OLD-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.tar.bz2
opensim-SC_OLD-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.tar.xz
TEST**** wingridproxy detection at grid login. Untested possible not
very reliable. Adds some load even on region servers because of code at BaseHttpServer.
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs15
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 7841f47..799ab80 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -966,6 +966,19 @@ namespace OpenSim.Framework.Servers.HttpServer
966 string responseString = String.Empty; 966 string responseString = String.Empty;
967 XmlRpcRequest xmlRprcRequest = null; 967 XmlRpcRequest xmlRprcRequest = null;
968 968
969 bool gridproxy = false;
970 if (requestBody.Contains("encoding=\"utf-8"))
971 {
972 int channelindx = -1;
973 int optionsindx = requestBody.IndexOf(">options<");
974 if(optionsindx >0)
975 {
976 channelindx = requestBody.IndexOf(">channel<");
977 if (optionsindx < channelindx)
978 gridproxy = true;
979 }
980 }
981
969 try 982 try
970 { 983 {
971 xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody); 984 xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody);
@@ -1023,6 +1036,8 @@ namespace OpenSim.Framework.Servers.HttpServer
1023 } 1036 }
1024 xmlRprcRequest.Params.Add(request.Headers.Get(xff)); // Param[3] 1037 xmlRprcRequest.Params.Add(request.Headers.Get(xff)); // Param[3]
1025 1038
1039 if (gridproxy)
1040 xmlRprcRequest.Params.Add("gridproxy"); // Param[4]
1026 try 1041 try
1027 { 1042 {
1028 xmlRpcResponse = method(xmlRprcRequest, request.RemoteIPEndPoint); 1043 xmlRpcResponse = method(xmlRprcRequest, request.RemoteIPEndPoint);