diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs index 5bca654..98a9d46 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs @@ -285,8 +285,7 @@ namespace OpenSim.Groups if (string.IsNullOrEmpty(reply)) return null; - Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( - reply); + Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); return replyData; } diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index ecfefe8..6543295 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -2202,7 +2202,7 @@ namespace OpenSim.Framework public static XmlRpcResponse SendXmlRpcCommand(string url, string methodName, object[] args) { XmlRpcRequest client = new(methodName, args); - return client.Send(url, 6000); + return client.Send(url, WebUtil.SharedHttpClientWithRedir, 6000); } /// <summary> diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 59d687f..afbb290 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs @@ -1691,7 +1691,7 @@ namespace OpenSim.Framework WebUtil.LogOutgoingDetail("SEND", reqnum, str); } - XmlRpcResponse Resp = Req.Send(url, 30000); + XmlRpcResponse Resp = Req.Send(url, WebUtil.SharedHttpClientWithRedir, 30000); try { diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 4887a74..0a39aeb 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs @@ -599,7 +599,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage XmlRpcRequest GridReq = new XmlRpcRequest("grid_instant_message", SendParams); try { - XmlRpcResponse GridResp = GridReq.Send(reginfo.ServerURI, 3000); + XmlRpcResponse GridResp = GridReq.Send(reginfo.ServerURI, WebUtil.SharedHttpClientWithRedir, 6000); Hashtable responseData = (Hashtable)GridResp.Value; if (responseData.ContainsKey("success")) { diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index 5f53439..fd7ba44 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs @@ -688,7 +688,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC XmlRpcRequest req = new XmlRpcRequest(mName, parameters); try { - XmlRpcResponse resp = req.Send(DestURL, 30000); + XmlRpcResponse resp = req.Send(DestURL, WebUtil.SharedHttpClientWithRedir, 30000); if (resp != null) { Hashtable respParms; diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 43da95b..66d97cc 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs @@ -94,7 +94,7 @@ namespace OpenSim.Services.Connectors.Hypergrid XmlRpcResponse response = null; try { - response = request.Send(info.ServerURI, 10000); + response = request.Send(info.ServerURI, WebUtil.SharedHttpClientWithRedir, 10000); } catch (Exception e) { @@ -230,7 +230,7 @@ namespace OpenSim.Services.Connectors.Hypergrid XmlRpcResponse response = null; try { - response = request.Send(gatekeeper.ServerURI, 10000); + response = request.Send(gatekeeper.ServerURI, WebUtil.SharedHttpClientWithRedir, 10000); } catch (Exception e) { diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index e919dd9..f7b322e 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs @@ -162,7 +162,7 @@ namespace OpenSim.Services.Connectors.Hypergrid XmlRpcResponse response = null; try { - response = request.Send(m_ServerURL, 10000); + response = request.Send(m_ServerURL, WebUtil.SharedHttpClientWithRedir, 10000); } catch (Exception e) { @@ -336,7 +336,7 @@ namespace OpenSim.Services.Connectors.Hypergrid XmlRpcResponse response = null; try { - response = request.Send(m_ServerURL, 6000); + response = request.Send(m_ServerURL, WebUtil.SharedHttpClientWithRedir, 6000); } catch { @@ -408,7 +408,7 @@ namespace OpenSim.Services.Connectors.Hypergrid XmlRpcResponse response = null; try { - response = request.Send(m_ServerURL, 10000); + response = request.Send(m_ServerURL, WebUtil.SharedHttpClientWithRedir, 10000); } catch { @@ -558,7 +558,7 @@ namespace OpenSim.Services.Connectors.Hypergrid XmlRpcResponse response = null; try { - response = request.Send(m_ServerURL, 10000); + response = request.Send(m_ServerURL, WebUtil.SharedHttpClientWithRedir, 10000); } catch (Exception e) { diff --git a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs index fa50b24..c5a2d5e 100644 --- a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs +++ b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs @@ -61,7 +61,7 @@ namespace OpenSim.Services.Connectors.InstantMessage try { - XmlRpcResponse GridResp = GridReq.Send(url, 10000); + XmlRpcResponse GridResp = GridReq.Send(url, WebUtil.SharedHttpClientWithRedir, 10000); Hashtable responseData = (Hashtable)GridResp.Value; diff --git a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs index a1122a2..5e5f1fc 100644 --- a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs @@ -92,7 +92,7 @@ namespace OpenSim.Services.Connectors paramList.Add(hash); XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); - XmlRpcResponse response = request.Send(info.ServerURI, 10000); + XmlRpcResponse response = request.Send(info.ServerURI, WebUtil.SharedHttpClientWithRedir, 10000); if (response.IsFault) { m_log.ErrorFormat("[LAND CONNECTOR]: remote call returned an error: {0}", response.FaultString); diff --git a/bin/XMLRPC.dll b/bin/XMLRPC.dll index e9107d6..85c3919 100755 Binary files a/bin/XMLRPC.dll and b/bin/XMLRPC.dll differ