8 files changed, 14 insertions, 0 deletions

diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 97b3b60..226e52f 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -306,6 +306,7 @@ namespace OpenSim.Framework.Communications
                 _request.ContentType = "application/xml";
                 _request.Timeout = 200000;
                 _request.Method = RequestMethod;
+                _request.Proxy = null;
                 _asyncException = null;
 
 //                IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
@@ -365,6 +366,7 @@ namespace OpenSim.Framework.Communications
             _request.ContentType = "application/xml";
             _request.Timeout = 900000;
             _request.Method = RequestMethod;
+            _request.Proxy = null;
             _asyncException = null;
             _request.ContentLength = src.Length;
 
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index 3dce578..7aaf776 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Framework.Configuration.HTTP
                 byte[] buf = new byte[8192];
                 HttpWebRequest request =
                     (HttpWebRequest) WebRequest.Create(remoteConfigSettings.baseConfigURL + configFileName);
+                request.Proxy = null;
                 HttpWebResponse response = (HttpWebResponse) request.GetResponse();
 
                 Stream resStream = response.GetResponseStream();
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index a2f5d9c..96d4d59 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -70,6 +70,7 @@ namespace OpenSim.Framework.RegionLoader.Web
                     int regionCount = 0;
                     HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
                     webRequest.Timeout = 30000; //30 Second Timeout
+                    webRequest.Proxy = null;
                     m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
 
                     try
diff --git a/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs b/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs
index 48ced19..61161e3 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
+            request.Proxy = null;
             request.ContentType = "text/xml";
 
             MemoryStream buffer = new MemoryStream();
diff --git a/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs b/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs
index 451745c..727f027 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs
@@ -57,6 +57,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
+            request.Proxy = null;
             request.ContentType = "text/xml";
             request.Timeout = 10000;
 
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index 19c03a8..1612d4a 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -74,6 +74,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
+            request.Proxy = null;
             request.ContentType = "text/xml";
             request.Timeout = 20000;
 
@@ -139,6 +140,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
+            request.Proxy = null;
             request.ContentType = "text/xml";
             request.Timeout = 10000;
 
diff --git a/OpenSim/Framework/UntrustedWebRequest.cs b/OpenSim/Framework/UntrustedWebRequest.cs
index e6411cc..f2355b1 100644
--- a/OpenSim/Framework/UntrustedWebRequest.cs
+++ b/OpenSim/Framework/UntrustedWebRequest.cs
@@ -88,6 +88,7 @@ namespace OpenSim.Framework
             httpWebRequest.ReadWriteTimeout = readWriteTimeoutMS;
             httpWebRequest.Timeout = timeoutMS;
             httpWebRequest.KeepAlive = false;
+            httpWebRequest.Proxy = null;
 
             return httpWebRequest;
         }
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 1d9e2ce..9eff0d2 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -171,6 +171,7 @@ namespace OpenSim.Framework
                 request.Method = method;
                 request.Timeout = timeout;
                 request.KeepAlive = false;
+                request.Proxy = null;
                 request.MaximumAutomaticRedirections = 10;
                 request.ReadWriteTimeout = timeout / 4;
                 request.Headers[OSHeaderRequestID] = reqnum.ToString();
@@ -350,6 +351,7 @@ namespace OpenSim.Framework
                 request.Method = "POST";
                 request.Timeout = timeout;
                 request.KeepAlive = false;
+                request.Proxy = null;
                 request.MaximumAutomaticRedirections = 10;
                 request.ReadWriteTimeout = timeout / 4;
                 request.Headers[OSHeaderRequestID] = reqnum.ToString();
@@ -730,6 +732,7 @@ namespace OpenSim.Framework
             Type type = typeof(TRequest);
 
             WebRequest request = WebRequest.Create(requestUrl);
+            request.Proxy = null;
             WebResponse response = null;
             TResponse deserial = default(TResponse);
             XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
@@ -924,6 +927,7 @@ namespace OpenSim.Framework
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
+            request.Proxy = null;
             string respstring = String.Empty;
 
             using (MemoryStream buffer = new MemoryStream())
@@ -1051,6 +1055,7 @@ namespace OpenSim.Framework
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
+            request.Proxy = null;
             MemoryStream buffer = null;
 
             if ((verb == "POST") || (verb == "PUT"))