From 44f57b4dc4373026d9dcdccdd03f2048566915e7 Mon Sep 17 00:00:00 2001
From: justincc <jjustincc@googlemail.com>
Date: Tue, 15 Dec 2009 17:38:28 +0000
Subject: [PATCH] Try Dive's suggestion of not requesting keep alive for rpc
 requests Only going to do this with the user service's
 deregister_messageserver and get_user_friend_list first of all to see if this
 can isolate any effect.

---
 .../MessageServersConnector.cs                | 56 +++++++++----------
 .../UserServerFriendsModule.cs                |  2 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
index 15895bf68c..c147d9ef11 100644
--- a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Grid.UserServer.Modules
             // Message Server ---> User Server
             m_httpServer.AddXmlRPCHandler("register_messageserver", XmlRPCRegisterMessageServer);
             m_httpServer.AddXmlRPCHandler("agent_change_region", XmlRPCUserMovedtoRegion);
-            m_httpServer.AddXmlRPCHandler("deregister_messageserver", XmlRPCDeRegisterMessageServer);
+            m_httpServer.AddXmlRPCHandler("deregister_messageserver", XmlRPCDeRegisterMessageServer, false);
         }
 
         public void RegisterMessageServer(string URI, MessageServerInfo serverData)
@@ -167,37 +167,37 @@ namespace OpenSim.Grid.UserServer.Modules
         }
         
         public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
-            m_log.DebugFormat(
-                "[MSGSERVER]: Beginning processing message service registration request from {0}",
+        {
+            m_log.DebugFormat(
+                "[MSGSERVER]: Beginning processing message service registration request from {0}",
                 remoteClient.Address);
 
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable responseData = new Hashtable();
-
-            if (requestData.Contains("uri"))
-            {
-                string URI = (string)requestData["uri"];
-                string sendkey = (string)requestData["sendkey"];
-                string recvkey = (string)requestData["recvkey"];
-                MessageServerInfo m = new MessageServerInfo();
-                m.URI = URI;
-                m.sendkey = sendkey;
-                m.recvkey = recvkey;
-                RegisterMessageServer(URI, m);
-                responseData["responsestring"] = "TRUE";
-                response.Value = responseData;
-
-                m_log.DebugFormat(
-                    "[MSGSERVER]: Successfully processed message service registration request from {0}",
-                    remoteClient.Address);
-            }
-            else
-            {
-                m_log.ErrorFormat(
-                    "[MSGSERVER]: Message service registration request from {0} did not contain a uri, not registering",
-                    remoteClient.Address);
+            Hashtable responseData = new Hashtable();
+
+            if (requestData.Contains("uri"))
+            {
+                string URI = (string)requestData["uri"];
+                string sendkey = (string)requestData["sendkey"];
+                string recvkey = (string)requestData["recvkey"];
+                MessageServerInfo m = new MessageServerInfo();
+                m.URI = URI;
+                m.sendkey = sendkey;
+                m.recvkey = recvkey;
+                RegisterMessageServer(URI, m);
+                responseData["responsestring"] = "TRUE";
+                response.Value = responseData;
+
+                m_log.DebugFormat(
+                    "[MSGSERVER]: Successfully processed message service registration request from {0}",
+                    remoteClient.Address);
+            }
+            else
+            {
+                m_log.ErrorFormat(
+                    "[MSGSERVER]: Message service registration request from {0} did not contain a uri, not registering",
+                    remoteClient.Address);
             }
             
             return response;
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
index 56e52a07a0..beb91488a2 100644
--- a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Grid.UserServer.Modules
             m_httpServer.AddXmlRPCHandler("add_new_user_friend", XmlRpcResponseXmlRPCAddUserFriend);
             m_httpServer.AddXmlRPCHandler("remove_user_friend", XmlRpcResponseXmlRPCRemoveUserFriend);
             m_httpServer.AddXmlRPCHandler("update_user_friend_perms", XmlRpcResponseXmlRPCUpdateUserFriendPerms);
-            m_httpServer.AddXmlRPCHandler("get_user_friend_list", XmlRpcResponseXmlRPCGetUserFriendList);
+            m_httpServer.AddXmlRPCHandler("get_user_friend_list", XmlRpcResponseXmlRPCGetUserFriendList, false);
         }
 
         public XmlRpcResponse FriendListItemListtoXmlRPCResponse(List<FriendListItem> returnUsers)