diff options
author | Diva Canto | 2012-09-30 07:48:03 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-30 07:48:03 -0700 |
commit | 91a5c602e313b96ffaf1d50b7f0d2923a2e141ba (patch) | |
tree | 3c76fe34e863fa990c6da0f72d8350c7476cf1e4 /OpenSim/Region/OptionalModules | |
parent | Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com... (diff) | |
download | opensim-SC-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.zip opensim-SC-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.tar.gz opensim-SC-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.tar.bz2 opensim-SC-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.tar.xz |
Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."
But the patch is here, in case anyone wants to try it.
This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
Diffstat (limited to 'OpenSim/Region/OptionalModules')
5 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index fbbb60f..e22618d 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 | updatePost.Proxy = null; | 389 | |
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 8a5ce62..37ab35a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -541,7 +541,6 @@ 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; | ||
545 | 544 | ||
546 | if (method == "POST") | 545 | if (method == "POST") |
547 | { | 546 | { |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index f5d8e19..c5fcef4 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -1119,7 +1119,6 @@ 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; | ||
1123 | 1122 | ||
1124 | // Send request and retrieve the response | 1123 | // Send request and retrieve the response |
1125 | rsp = (HttpWebResponse)req.GetResponse(); | 1124 | rsp = (HttpWebResponse)req.GetResponse(); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index 5102115..d412cd1 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | |||
@@ -1150,7 +1150,6 @@ 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; | ||
1154 | 1153 | ||
1155 | Stream stream = request.GetRequestStream(); | 1154 | Stream stream = request.GetRequestStream(); |
1156 | XmlTextWriter xml = new XmlTextWriter(stream, Encoding.ASCII); | 1155 | 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 3e476ce..bad75f7 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
@@ -280,7 +280,6 @@ 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; | ||
284 | 283 | ||
285 | Stream os = null; | 284 | Stream os = null; |
286 | try | 285 | try |