diff options
author | Diva Canto | 2012-09-30 07:22:55 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-30 07:22:55 -0700 |
commit | 531edd51d82ecd6a842a2611c99e9919634491ef (patch) | |
tree | 0e28069aa1b2278f91b9275f98db7990abb7d964 /OpenSim/Region/OptionalModules | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.zip opensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.tar.gz opensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.tar.bz2 opensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.tar.xz |
Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow.
Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
Diffstat (limited to 'OpenSim/Region/OptionalModules')
5 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index e22618d..fbbb60f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -386,7 +386,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
386 | updatePost.ContentType = "text/xml"; | 386 | updatePost.ContentType = "text/xml"; |
387 | updatePost.ContentLength = payload.Length; | 387 | updatePost.ContentLength = payload.Length; |
388 | updatePost.UserAgent = "OpenSim.Concierge"; | 388 | updatePost.UserAgent = "OpenSim.Concierge"; |
389 | 389 | updatePost.Proxy = null; | |
390 | 390 | ||
391 | BrokerState bs = new BrokerState(uri, payload, updatePost); | 391 | BrokerState bs = new BrokerState(uri, payload, updatePost); |
392 | bs.Timer = new Timer(delegate(object state) | 392 | bs.Timer = new Timer(delegate(object state) |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 37ab35a..8a5ce62 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -541,6 +541,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
541 | forwardreq.Method = method; | 541 | forwardreq.Method = method; |
542 | forwardreq.ContentType = contenttype; | 542 | forwardreq.ContentType = contenttype; |
543 | forwardreq.KeepAlive = false; | 543 | forwardreq.KeepAlive = false; |
544 | forwardreq.Proxy = null; | ||
544 | 545 | ||
545 | if (method == "POST") | 546 | if (method == "POST") |
546 | { | 547 | { |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index c5fcef4..f5d8e19 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -1119,6 +1119,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1119 | 1119 | ||
1120 | // We are sending just parameters, no content | 1120 | // We are sending just parameters, no content |
1121 | req.ContentLength = 0; | 1121 | req.ContentLength = 0; |
1122 | req.Proxy = null; | ||
1122 | 1123 | ||
1123 | // Send request and retrieve the response | 1124 | // Send request and retrieve the response |
1124 | rsp = (HttpWebResponse)req.GetResponse(); | 1125 | rsp = (HttpWebResponse)req.GetResponse(); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index d412cd1..5102115 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | |||
@@ -1150,6 +1150,7 @@ namespace Nwc.XmlRpc | |||
1150 | request.ContentType = "text/xml"; | 1150 | request.ContentType = "text/xml"; |
1151 | request.AllowWriteStreamBuffering = true; | 1151 | request.AllowWriteStreamBuffering = true; |
1152 | request.KeepAlive = !_disableKeepAlive; | 1152 | request.KeepAlive = !_disableKeepAlive; |
1153 | request.Proxy = null; | ||
1153 | 1154 | ||
1154 | Stream stream = request.GetRequestStream(); | 1155 | Stream stream = request.GetRequestStream(); |
1155 | XmlTextWriter xml = new XmlTextWriter(stream, Encoding.ASCII); | 1156 | XmlTextWriter xml = new XmlTextWriter(stream, Encoding.ASCII); |
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index bad75f7..3e476ce 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
@@ -280,6 +280,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
280 | WebRequest request = WebRequest.Create(m_uri); | 280 | WebRequest request = WebRequest.Create(m_uri); |
281 | request.Method = request_method; | 281 | request.Method = request_method; |
282 | request.ContentType = content_type; | 282 | request.ContentType = content_type; |
283 | request.Proxy = null; | ||
283 | 284 | ||
284 | Stream os = null; | 285 | Stream os = null; |
285 | try | 286 | try |