diff options
author | justincc | 2009-12-16 16:52:38 +0000 |
---|---|---|
committer | justincc | 2009-12-16 16:52:38 +0000 |
commit | 136476aaf3d9b3cacb13ff55a001bfd1f56b6b2a (patch) | |
tree | d7d37a96ae443195950f3f710895c99574b0db00 | |
parent | Turn on HttpServer_OpenSim.dll logging temporarily (diff) | |
download | opensim-SC_OLD-136476aaf3d9b3cacb13ff55a001bfd1f56b6b2a.zip opensim-SC_OLD-136476aaf3d9b3cacb13ff55a001bfd1f56b6b2a.tar.gz opensim-SC_OLD-136476aaf3d9b3cacb13ff55a001bfd1f56b6b2a.tar.bz2 opensim-SC_OLD-136476aaf3d9b3cacb13ff55a001bfd1f56b6b2a.tar.xz |
try disabling keep-alive on every xml rpc handler in the user server
7 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs b/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs index 0c84348..ecadd1e 100644 --- a/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs +++ b/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
69 | m_httpServer = httpServer; | 69 | m_httpServer = httpServer; |
70 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", | 70 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", |
71 | m_gridInfoService.RestGetGridInfoMethod)); | 71 | m_gridInfoService.RestGetGridInfoMethod)); |
72 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); | 72 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod, false); |
73 | } | 73 | } |
74 | 74 | ||
75 | public void Close() | 75 | public void Close() |
diff --git a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs index 122bc18..4060fd4 100644 --- a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs | |||
@@ -106,14 +106,14 @@ namespace OpenSim.Grid.UserServer.Modules | |||
106 | { | 106 | { |
107 | m_httpServer = httpServer; | 107 | m_httpServer = httpServer; |
108 | 108 | ||
109 | m_httpServer.AddXmlRPCHandler("region_startup", RegionStartup); | 109 | m_httpServer.AddXmlRPCHandler("region_startup", RegionStartup, false); |
110 | m_httpServer.AddXmlRPCHandler("region_shutdown", RegionShutdown); | 110 | m_httpServer.AddXmlRPCHandler("region_shutdown", RegionShutdown, false); |
111 | m_httpServer.AddXmlRPCHandler("agent_location", AgentLocation); | 111 | m_httpServer.AddXmlRPCHandler("agent_location", AgentLocation, false); |
112 | m_httpServer.AddXmlRPCHandler("agent_leaving", AgentLeaving); | 112 | m_httpServer.AddXmlRPCHandler("agent_leaving", AgentLeaving, false); |
113 | // Message Server ---> User Server | 113 | // Message Server ---> User Server |
114 | m_httpServer.AddXmlRPCHandler("register_messageserver", XmlRPCRegisterMessageServer, false); | 114 | m_httpServer.AddXmlRPCHandler("register_messageserver", XmlRPCRegisterMessageServer, false); |
115 | m_httpServer.AddXmlRPCHandler("agent_change_region", XmlRPCUserMovedtoRegion); | 115 | m_httpServer.AddXmlRPCHandler("agent_change_region", XmlRPCUserMovedtoRegion, false); |
116 | m_httpServer.AddXmlRPCHandler("deregister_messageserver", XmlRPCDeRegisterMessageServer); | 116 | m_httpServer.AddXmlRPCHandler("deregister_messageserver", XmlRPCDeRegisterMessageServer, false); |
117 | } | 117 | } |
118 | 118 | ||
119 | public void RegisterMessageServer(string URI, MessageServerInfo serverData) | 119 | public void RegisterMessageServer(string URI, MessageServerInfo serverData) |
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs index 77caf47..8cf7f00 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs | |||
@@ -82,9 +82,9 @@ namespace OpenSim.Grid.UserServer.Modules | |||
82 | { | 82 | { |
83 | m_httpServer = httpServer; | 83 | m_httpServer = httpServer; |
84 | 84 | ||
85 | httpServer.AddXmlRPCHandler("hg_login", XmlRpcLoginMethod); | 85 | httpServer.AddXmlRPCHandler("hg_login", XmlRpcLoginMethod, false); |
86 | httpServer.AddXmlRPCHandler("hg_new_auth_key", XmlRpcGenerateKeyMethod); | 86 | httpServer.AddXmlRPCHandler("hg_new_auth_key", XmlRpcGenerateKeyMethod, false); |
87 | httpServer.AddXmlRPCHandler("hg_verify_auth_key", XmlRpcVerifyKeyMethod); | 87 | httpServer.AddXmlRPCHandler("hg_verify_auth_key", XmlRpcVerifyKeyMethod, false); |
88 | } | 88 | } |
89 | 89 | ||
90 | 90 | ||
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs index d46ff9b..23185ad 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs | |||
@@ -90,9 +90,9 @@ namespace OpenSim.Grid.UserServer.Modules | |||
90 | { | 90 | { |
91 | m_httpServer = httpServer; | 91 | m_httpServer = httpServer; |
92 | 92 | ||
93 | m_httpServer.AddXmlRPCHandler("login_to_simulator", XmlRpcLoginMethod); | 93 | m_httpServer.AddXmlRPCHandler("login_to_simulator", XmlRpcLoginMethod, false); |
94 | m_httpServer.AddHTTPHandler("login", ProcessHTMLLogin); | 94 | m_httpServer.AddHTTPHandler("login", ProcessHTMLLogin); |
95 | m_httpServer.AddXmlRPCHandler("set_login_params", XmlRPCSetLoginParams); | 95 | m_httpServer.AddXmlRPCHandler("set_login_params", XmlRPCSetLoginParams, false); |
96 | m_httpServer.AddXmlRPCHandler("check_auth_session", XmlRPCCheckAuthSession, false); | 96 | m_httpServer.AddXmlRPCHandler("check_auth_session", XmlRPCCheckAuthSession, false); |
97 | 97 | ||
98 | if (registerLLSDHandler) | 98 | if (registerLLSDHandler) |
diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs index 36c6297..3eb4b8a 100644 --- a/OpenSim/Grid/UserServer.Modules/UserManager.cs +++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs | |||
@@ -104,18 +104,18 @@ namespace OpenSim.Grid.UserServer.Modules | |||
104 | 104 | ||
105 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/users/", RESTGetUserProfile)); | 105 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/users/", RESTGetUserProfile)); |
106 | 106 | ||
107 | m_httpServer.AddXmlRPCHandler("get_user_by_name", XmlRPCGetUserMethodName); | 107 | m_httpServer.AddXmlRPCHandler("get_user_by_name", XmlRPCGetUserMethodName, false); |
108 | m_httpServer.AddXmlRPCHandler("get_user_by_uuid", XmlRPCGetUserMethodUUID); | 108 | m_httpServer.AddXmlRPCHandler("get_user_by_uuid", XmlRPCGetUserMethodUUID, false); |
109 | m_httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", XmlRPCGetAvatarPickerAvatar); | 109 | m_httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", XmlRPCGetAvatarPickerAvatar, false); |
110 | 110 | ||
111 | // Used by IAR module to do password checks | 111 | // Used by IAR module to do password checks |
112 | m_httpServer.AddXmlRPCHandler("authenticate_user_by_password", XmlRPCAuthenticateUserMethodPassword); | 112 | m_httpServer.AddXmlRPCHandler("authenticate_user_by_password", XmlRPCAuthenticateUserMethodPassword, false); |
113 | 113 | ||
114 | m_httpServer.AddXmlRPCHandler("update_user_current_region", XmlRPCAtRegion); | 114 | m_httpServer.AddXmlRPCHandler("update_user_current_region", XmlRPCAtRegion, false); |
115 | m_httpServer.AddXmlRPCHandler("logout_of_simulator", XmlRPCLogOffUserMethodUUID); | 115 | m_httpServer.AddXmlRPCHandler("logout_of_simulator", XmlRPCLogOffUserMethodUUID, false); |
116 | m_httpServer.AddXmlRPCHandler("get_agent_by_uuid", XmlRPCGetAgentMethodUUID); | 116 | m_httpServer.AddXmlRPCHandler("get_agent_by_uuid", XmlRPCGetAgentMethodUUID, false); |
117 | 117 | ||
118 | m_httpServer.AddXmlRPCHandler("update_user_profile", XmlRpcResponseXmlRPCUpdateUserProfile); | 118 | m_httpServer.AddXmlRPCHandler("update_user_profile", XmlRpcResponseXmlRPCUpdateUserProfile, false); |
119 | 119 | ||
120 | m_httpServer.AddStreamHandler(new RestStreamHandler("DELETE", "/usersessions/", RestDeleteUserSessionMethod)); | 120 | m_httpServer.AddStreamHandler(new RestStreamHandler("DELETE", "/usersessions/", RestDeleteUserSessionMethod)); |
121 | } | 121 | } |
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs index 88918d1..658a771 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs | |||
@@ -67,8 +67,8 @@ namespace OpenSim.Grid.UserServer.Modules | |||
67 | { | 67 | { |
68 | m_httpServer = httpServer; | 68 | m_httpServer = httpServer; |
69 | 69 | ||
70 | m_httpServer.AddXmlRPCHandler("get_avatar_appearance", XmlRPCGetAvatarAppearance); | 70 | m_httpServer.AddXmlRPCHandler("get_avatar_appearance", XmlRPCGetAvatarAppearance, false); |
71 | m_httpServer.AddXmlRPCHandler("update_avatar_appearance", XmlRPCUpdateAvatarAppearance); | 71 | m_httpServer.AddXmlRPCHandler("update_avatar_appearance", XmlRPCUpdateAvatarAppearance, false); |
72 | } | 72 | } |
73 | 73 | ||
74 | public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request, IPEndPoint remoteClient) | 74 | public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request, IPEndPoint remoteClient) |
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs index beb9148..57a618d 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs | |||
@@ -68,9 +68,9 @@ namespace OpenSim.Grid.UserServer.Modules | |||
68 | { | 68 | { |
69 | m_httpServer = httpServer; | 69 | m_httpServer = httpServer; |
70 | 70 | ||
71 | m_httpServer.AddXmlRPCHandler("add_new_user_friend", XmlRpcResponseXmlRPCAddUserFriend); | 71 | m_httpServer.AddXmlRPCHandler("add_new_user_friend", XmlRpcResponseXmlRPCAddUserFriend, false); |
72 | m_httpServer.AddXmlRPCHandler("remove_user_friend", XmlRpcResponseXmlRPCRemoveUserFriend); | 72 | m_httpServer.AddXmlRPCHandler("remove_user_friend", XmlRpcResponseXmlRPCRemoveUserFriend, false); |
73 | m_httpServer.AddXmlRPCHandler("update_user_friend_perms", XmlRpcResponseXmlRPCUpdateUserFriendPerms); | 73 | m_httpServer.AddXmlRPCHandler("update_user_friend_perms", XmlRpcResponseXmlRPCUpdateUserFriendPerms, false); |
74 | m_httpServer.AddXmlRPCHandler("get_user_friend_list", XmlRpcResponseXmlRPCGetUserFriendList, false); | 74 | m_httpServer.AddXmlRPCHandler("get_user_friend_list", XmlRpcResponseXmlRPCGetUserFriendList, false); |
75 | } | 75 | } |
76 | 76 | ||