ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-14 18:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

update xmlrpc.dll with a send variant using httpclint and used it

Browse Source
This commit is contained in:
UbitUmarov
2023-05-24 13:42:56 +01:00
parent 2bd08a19d5
commit 5e0c6446d8
10 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs
View File

@@ -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;
}

2
OpenSim/Framework/Util.cs
View File

@@ -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>

2
OpenSim/Framework/WebUtil.cs
View File

@@ -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
{

2
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@@ -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"))
{

2
OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
View File

@@ -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;

4
OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
View File

@@ -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)
{

8
OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
View File

@@ -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)
{

2
OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs
View File

@@ -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;

2
OpenSim/Services/Connectors/Land/LandServicesConnector.cs
View File

@@ -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);

BIN
bin/XMLRPC.dll
View File

Binary file not shown.