From 531edd51d82ecd6a842a2611c99e9919634491ef Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Sep 2012 07:22:55 -0700
Subject: 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

---
 .../Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs   | 6 +++++-
 OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/Connectors/SimianGrid')

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 6bfc5cc..2b00b4d 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -184,6 +184,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
                 request.Method = "HEAD";
+                request.Proxy = null;
 
                 using (WebResponse response = request.GetResponse())
                 {
@@ -339,7 +340,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 // Simian does not require the asset ID to be in the URL because it's in the post data.
                 // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs
                 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString());
-                
+                request.Proxy = null;
+
                 HttpWebResponse response = MultipartForm.Post(request, postParameters);
                 using (Stream responseStream = response.GetResponseStream())
                 {
@@ -427,6 +429,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
                 request.Method = "DELETE";
+                request.Proxy = null;
 
                 using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
                 {
@@ -460,6 +463,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             try
             {
                 HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
+                request.Proxy = null;
 
                 using (WebResponse response = request.GetResponse())
                 {
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
index 93fdae3..730d1da 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
@@ -212,6 +212,7 @@ namespace OpenSim.Region.OptionalModules.Simian
                 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl);
                 request.Timeout = 20000;
                 request.ReadWriteTimeout = 5000;
+                request.Proxy = null;
 
                 using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
                 {
-- 
cgit v1.1