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

dirkhusemann · May 24, 2023 · 5e0c644 · 5e0c644
1 parent 2bd08a1
commit 5e0c644
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 14 deletions.
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs
@@ -285,8 +285,7 @@ private Dictionary<string, object> MakeRequest(string method, Dictionary<string,
             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
@@ -2202,7 +2202,7 @@ public static XmlRpcResponse XmlRpcCommand(string url, string methodName, params
         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
@@ -1691,7 +1691,7 @@ public static Hashtable SendRequest(Hashtable ReqParams, string method, string u
                     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
@@ -599,7 +599,7 @@ protected virtual bool doIMSending(GridRegion reginfo, Hashtable xmlrpcdata)
             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
@@ -688,7 +688,7 @@ public void SendRequest()
             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
@@ -94,7 +94,7 @@ public bool LinkRegion(GridRegion info, out UUID regionID, out ulong realHandle,
             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 @@ public GridRegion GetHyperlinkRegion(GridRegion gatekeeper, UUID regionID, UUID
             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
@@ -162,7 +162,7 @@ private Hashtable CallServer(string methodName, Hashtable hash)
             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 @@ public List<UUID> StatusNotification(List<string> friends, UUID userID, bool onl
             XmlRpcResponse response = null;
             try
             {
-                response = request.Send(m_ServerURL, 6000);
+                response = request.Send(m_ServerURL, WebUtil.SharedHttpClientWithRedir, 6000);
             }
             catch
             {
@@ -408,7 +408,7 @@ public List<UUID> GetOnlineFriends(UUID userID, List<string> friends)
             XmlRpcResponse response = null;
             try
             {
-                response = request.Send(m_ServerURL, 10000);
+                response = request.Send(m_ServerURL, WebUtil.SharedHttpClientWithRedir, 10000);
             }
             catch
             {
@@ -558,7 +558,7 @@ private bool GetBoolResponse(XmlRpcRequest request, out string reason)
             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
@@ -61,7 +61,7 @@ public static bool SendInstantMessage(string url, GridInstantMessage im, string
             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
@@ -92,7 +92,7 @@ public virtual LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, ui
                     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
-Original file line number
+Diff line change
@@ Expand Up @@
                         WebUtil.LogOutgoingDetail("SEND", reqnum, str);
                     }
-                    XmlRpcResponse Resp = Req.Send(url, 30000);
+                    XmlRpcResponse Resp = Req.Send(url, WebUtil.SharedHttpClientWithRedir, 30000);
                     try
                     {
@@ Expand Down @@