From 91a5c602e313b96ffaf1d50b7f0d2923a2e141ba Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Sep 2012 07:48:03 -0700
Subject: 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.
---
 OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs      | 1 -
 OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs  | 1 -
 OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs | 1 -
 .../Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs   | 6 +-----
 OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs   | 1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
index 089e878..5c50936 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
@@ -77,7 +77,6 @@ namespace OpenSim.Services.Connectors
         public virtual string Helo()
         {
             HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
-            req.Proxy = null;
             // Eventually we need to switch to HEAD
             /* req.Method = "HEAD"; */
 
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 8cd2daa..2f263ae 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -125,7 +125,6 @@ namespace OpenSim.Services.Connectors.Hypergrid
             AgentCreateRequest.Method = "POST";
             AgentCreateRequest.ContentType = "application/json";
             AgentCreateRequest.Timeout = 10000;
-            AgentCreateRequest.Proxy = null;
             //AgentCreateRequest.KeepAlive = false;
             //AgentCreateRequest.Headers.Add("Authorization", authKey);
 
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index 07142bf..7429293 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -107,7 +107,6 @@ namespace OpenSim.Services.Connectors
             helloNeighbourRequest.Method = "POST";
             helloNeighbourRequest.ContentType = "application/json";
             helloNeighbourRequest.Timeout = 10000;
-            helloNeighbourRequest.Proxy = null;
 
             // Fill it in
             OSDMap args = null;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 2b00b4d..6bfc5cc 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -184,7 +184,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
                 request.Method = "HEAD";
-                request.Proxy = null;
 
                 using (WebResponse response = request.GetResponse())
                 {
@@ -340,8 +339,7 @@ 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())
                 {
@@ -429,7 +427,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
                 request.Method = "DELETE";
-                request.Proxy = null;
 
                 using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
                 {
@@ -463,7 +460,6 @@ 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 730d1da..93fdae3 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
@@ -212,7 +212,6 @@ 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