aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ConsoleClient/Requester.cs2
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs2
-rw-r--r--OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs1
-rw-r--r--OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs1
-rw-r--r--OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs1
-rw-r--r--OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs1
-rw-r--r--OpenSim/Framework/Servers/HttpServer/RestSessionService.cs2
-rw-r--r--OpenSim/Framework/UntrustedWebRequest.cs1
-rw-r--r--OpenSim/Framework/WebUtil.cs5
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs1
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs12
-rw-r--r--OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs1
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs1
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs1
-rw-r--r--OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs1
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs6
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs1
25 files changed, 41 insertions, 8 deletions
diff --git a/OpenSim/ConsoleClient/Requester.cs b/OpenSim/ConsoleClient/Requester.cs
index aabb02c..0952e58 100644
--- a/OpenSim/ConsoleClient/Requester.cs
+++ b/OpenSim/ConsoleClient/Requester.cs
@@ -46,8 +46,8 @@ namespace OpenSim.ConsoleClient
46 WebRequest request = WebRequest.Create(requestUrl); 46 WebRequest request = WebRequest.Create(requestUrl);
47 WebResponse response = null; 47 WebResponse response = null;
48 48
49 request.Proxy = null;
49 request.Method = "POST"; 50 request.Method = "POST";
50
51 request.ContentType = "application/x-www-form-urlencoded"; 51 request.ContentType = "application/x-www-form-urlencoded";
52 52
53 byte[] buffer = Encoding.ASCII.GetBytes(data); 53 byte[] buffer = Encoding.ASCII.GetBytes(data);
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
306 _request.ContentType = "application/xml"; 306 _request.ContentType = "application/xml";
307 _request.Timeout = 200000; 307 _request.Timeout = 200000;
308 _request.Method = RequestMethod; 308 _request.Method = RequestMethod;
309 _request.Proxy = null;
309 _asyncException = null; 310 _asyncException = null;
310 311
311// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request); 312// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
@@ -365,6 +366,7 @@ namespace OpenSim.Framework.Communications
365 _request.ContentType = "application/xml"; 366 _request.ContentType = "application/xml";
366 _request.Timeout = 900000; 367 _request.Timeout = 900000;
367 _request.Method = RequestMethod; 368 _request.Method = RequestMethod;
369 _request.Proxy = null;
368 _asyncException = null; 370 _asyncException = null;
369 _request.ContentLength = src.Length; 371 _request.ContentLength = src.Length;
370 372
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
65 byte[] buf = new byte[8192]; 65 byte[] buf = new byte[8192];
66 HttpWebRequest request = 66 HttpWebRequest request =
67 (HttpWebRequest) WebRequest.Create(remoteConfigSettings.baseConfigURL + configFileName); 67 (HttpWebRequest) WebRequest.Create(remoteConfigSettings.baseConfigURL + configFileName);
68 request.Proxy = null;
68 HttpWebResponse response = (HttpWebResponse) request.GetResponse(); 69 HttpWebResponse response = (HttpWebResponse) request.GetResponse();
69 70
70 Stream resStream = response.GetResponseStream(); 71 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
70 int regionCount = 0; 70 int regionCount = 0;
71 HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url); 71 HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
72 webRequest.Timeout = 30000; //30 Second Timeout 72 webRequest.Timeout = 30000; //30 Second Timeout
73 webRequest.Proxy = null;
73 m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url); 74 m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
74 75
75 try 76 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
50 50
51 WebRequest request = WebRequest.Create(requestUrl); 51 WebRequest request = WebRequest.Create(requestUrl);
52 request.Method = verb; 52 request.Method = verb;
53 request.Proxy = null;
53 request.ContentType = "text/xml"; 54 request.ContentType = "text/xml";
54 55
55 MemoryStream buffer = new MemoryStream(); 56 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
57 57
58 WebRequest request = WebRequest.Create(requestUrl); 58 WebRequest request = WebRequest.Create(requestUrl);
59 request.Method = verb; 59 request.Method = verb;
60 request.Proxy = null;
60 request.ContentType = "text/xml"; 61 request.ContentType = "text/xml";
61 request.Timeout = 10000; 62 request.Timeout = 10000;
62 63
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
74 74
75 WebRequest request = WebRequest.Create(requestUrl); 75 WebRequest request = WebRequest.Create(requestUrl);
76 request.Method = verb; 76 request.Method = verb;
77 request.Proxy = null;
77 request.ContentType = "text/xml"; 78 request.ContentType = "text/xml";
78 request.Timeout = 20000; 79 request.Timeout = 20000;
79 80
@@ -139,6 +140,7 @@ namespace OpenSim.Framework.Servers.HttpServer
139 140
140 WebRequest request = WebRequest.Create(requestUrl); 141 WebRequest request = WebRequest.Create(requestUrl);
141 request.Method = verb; 142 request.Method = verb;
143 request.Proxy = null;
142 request.ContentType = "text/xml"; 144 request.ContentType = "text/xml";
143 request.Timeout = 10000; 145 request.Timeout = 10000;
144 146
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
88 httpWebRequest.ReadWriteTimeout = readWriteTimeoutMS; 88 httpWebRequest.ReadWriteTimeout = readWriteTimeoutMS;
89 httpWebRequest.Timeout = timeoutMS; 89 httpWebRequest.Timeout = timeoutMS;
90 httpWebRequest.KeepAlive = false; 90 httpWebRequest.KeepAlive = false;
91 httpWebRequest.Proxy = null;
91 92
92 return httpWebRequest; 93 return httpWebRequest;
93 } 94 }
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
171 request.Method = method; 171 request.Method = method;
172 request.Timeout = timeout; 172 request.Timeout = timeout;
173 request.KeepAlive = false; 173 request.KeepAlive = false;
174 request.Proxy = null;
174 request.MaximumAutomaticRedirections = 10; 175 request.MaximumAutomaticRedirections = 10;
175 request.ReadWriteTimeout = timeout / 4; 176 request.ReadWriteTimeout = timeout / 4;
176 request.Headers[OSHeaderRequestID] = reqnum.ToString(); 177 request.Headers[OSHeaderRequestID] = reqnum.ToString();
@@ -350,6 +351,7 @@ namespace OpenSim.Framework
350 request.Method = "POST"; 351 request.Method = "POST";
351 request.Timeout = timeout; 352 request.Timeout = timeout;
352 request.KeepAlive = false; 353 request.KeepAlive = false;
354 request.Proxy = null;
353 request.MaximumAutomaticRedirections = 10; 355 request.MaximumAutomaticRedirections = 10;
354 request.ReadWriteTimeout = timeout / 4; 356 request.ReadWriteTimeout = timeout / 4;
355 request.Headers[OSHeaderRequestID] = reqnum.ToString(); 357 request.Headers[OSHeaderRequestID] = reqnum.ToString();
@@ -730,6 +732,7 @@ namespace OpenSim.Framework
730 Type type = typeof(TRequest); 732 Type type = typeof(TRequest);
731 733
732 WebRequest request = WebRequest.Create(requestUrl); 734 WebRequest request = WebRequest.Create(requestUrl);
735 request.Proxy = null;
733 WebResponse response = null; 736 WebResponse response = null;
734 TResponse deserial = default(TResponse); 737 TResponse deserial = default(TResponse);
735 XmlSerializer deserializer = new XmlSerializer(typeof(TResponse)); 738 XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
@@ -924,6 +927,7 @@ namespace OpenSim.Framework
924 927
925 WebRequest request = WebRequest.Create(requestUrl); 928 WebRequest request = WebRequest.Create(requestUrl);
926 request.Method = verb; 929 request.Method = verb;
930 request.Proxy = null;
927 string respstring = String.Empty; 931 string respstring = String.Empty;
928 932
929 using (MemoryStream buffer = new MemoryStream()) 933 using (MemoryStream buffer = new MemoryStream())
@@ -1051,6 +1055,7 @@ namespace OpenSim.Framework
1051 1055
1052 WebRequest request = WebRequest.Create(requestUrl); 1056 WebRequest request = WebRequest.Create(requestUrl);
1053 request.Method = verb; 1057 request.Method = verb;
1058 request.Proxy = null;
1054 MemoryStream buffer = null; 1059 MemoryStream buffer = null;
1055 1060
1056 if ((verb == "POST") || (verb == "PUT")) 1061 if ((verb == "POST") || (verb == "PUT"))
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index d328eb3..2be91c0 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -384,6 +384,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
384 Request = (HttpWebRequest) WebRequest.Create(Url); 384 Request = (HttpWebRequest) WebRequest.Create(Url);
385 Request.Method = HttpMethod; 385 Request.Method = HttpMethod;
386 Request.ContentType = HttpMIMEType; 386 Request.ContentType = HttpMIMEType;
387 Request.Proxy = null;
387 388
388 if(!HttpVerifyCert) 389 if(!HttpVerifyCert)
389 { 390 {
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 45e6527..5af3326 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -148,19 +148,21 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
148 private void MakeHttpRequest(string url, UUID requestID) 148 private void MakeHttpRequest(string url, UUID requestID)
149 { 149 {
150 WebRequest request = HttpWebRequest.Create(url); 150 WebRequest request = HttpWebRequest.Create(url);
151 151
152 if (m_proxyurl != null && m_proxyurl.Length > 0) 152 if (m_proxyurl != null && m_proxyurl.Length > 0)
153 { 153 {
154 if (m_proxyexcepts != null && m_proxyexcepts.Length > 0) 154 if (m_proxyexcepts != null && m_proxyexcepts.Length > 0)
155 { 155 {
156 string[] elist = m_proxyexcepts.Split(';'); 156 string[] elist = m_proxyexcepts.Split(';');
157 request.Proxy = new WebProxy(m_proxyurl, true, elist); 157 request.Proxy = new WebProxy(m_proxyurl, true, elist);
158 } 158 }
159 else 159 else
160 { 160 {
161 request.Proxy = new WebProxy(m_proxyurl, true); 161 request.Proxy = new WebProxy(m_proxyurl, true);
162 } 162 }
163 } 163 }
164 else
165 request.Proxy = null;
164 166
165 RequestState state = new RequestState((HttpWebRequest) request, requestID); 167 RequestState state = new RequestState((HttpWebRequest) request, requestID);
166 // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); 168 // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state);
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index b4e3d77..9def6ee 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -826,6 +826,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
826 try 826 try
827 { 827 {
828 WebRequest request = HttpWebRequest.Create(url); 828 WebRequest request = HttpWebRequest.Create(url);
829 request.Proxy = null;
829//Ckrinke: Comment out for now as 'str' is unused. Bring it back into play later when it is used. 830//Ckrinke: Comment out for now as 'str' is unused. Bring it back into play later when it is used.
830//Ckrinke Stream str = null; 831//Ckrinke Stream str = null;
831 HttpWebResponse response = (HttpWebResponse)(request).GetResponse(); 832 HttpWebResponse response = (HttpWebResponse)(request).GetResponse();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
index c72acc3..ff8f119 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
@@ -110,6 +110,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
110 110
111 request.ContentLength = 0; 111 request.ContentLength = 0;
112 request.KeepAlive = false; 112 request.KeepAlive = false;
113 request.Proxy = null;
113 114
114 WebResponse response = request.GetResponse(); 115 WebResponse response = request.GetResponse();
115 Stream file = response.GetResponseStream(); 116 Stream file = response.GetResponseStream();
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 4694b14..c70031f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -352,6 +352,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
352 352
353 request.ContentLength = 0; 353 request.ContentLength = 0;
354 request.KeepAlive = false; 354 request.KeepAlive = false;
355 request.Proxy = null;
355 356
356 WebResponse response = request.GetResponse(); 357 WebResponse response = request.GetResponse();
357 Stream file = response.GetResponseStream(); 358 Stream file = response.GetResponseStream();
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index dfba3ff..0fdc5a8 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -819,6 +819,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
819 819
820 mapitemsrequest.Method = "POST"; 820 mapitemsrequest.Method = "POST";
821 mapitemsrequest.ContentType = "application/xml+llsd"; 821 mapitemsrequest.ContentType = "application/xml+llsd";
822 mapitemsrequest.Proxy = null;
822 OSDMap RAMap = new OSDMap(); 823 OSDMap RAMap = new OSDMap();
823 824
824 // string RAMapString = RAMap.ToString(); 825 // string RAMapString = RAMap.ToString();
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
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
index 5c50936..089e878 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
@@ -77,6 +77,7 @@ namespace OpenSim.Services.Connectors
77 public virtual string Helo() 77 public virtual string Helo()
78 { 78 {
79 HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI); 79 HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
80 req.Proxy = null;
80 // Eventually we need to switch to HEAD 81 // Eventually we need to switch to HEAD
81 /* req.Method = "HEAD"; */ 82 /* req.Method = "HEAD"; */
82 83
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 2f263ae..8cd2daa 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -125,6 +125,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
125 AgentCreateRequest.Method = "POST"; 125 AgentCreateRequest.Method = "POST";
126 AgentCreateRequest.ContentType = "application/json"; 126 AgentCreateRequest.ContentType = "application/json";
127 AgentCreateRequest.Timeout = 10000; 127 AgentCreateRequest.Timeout = 10000;
128 AgentCreateRequest.Proxy = null;
128 //AgentCreateRequest.KeepAlive = false; 129 //AgentCreateRequest.KeepAlive = false;
129 //AgentCreateRequest.Headers.Add("Authorization", authKey); 130 //AgentCreateRequest.Headers.Add("Authorization", authKey);
130 131
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index 7429293..07142bf 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -107,6 +107,7 @@ namespace OpenSim.Services.Connectors
107 helloNeighbourRequest.Method = "POST"; 107 helloNeighbourRequest.Method = "POST";
108 helloNeighbourRequest.ContentType = "application/json"; 108 helloNeighbourRequest.ContentType = "application/json";
109 helloNeighbourRequest.Timeout = 10000; 109 helloNeighbourRequest.Timeout = 10000;
110 helloNeighbourRequest.Proxy = null;
110 111
111 // Fill it in 112 // Fill it in
112 OSDMap args = null; 113 OSDMap args = null;
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
184 { 184 {
185 HttpWebRequest request = UntrustedHttpWebRequest.Create(url); 185 HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
186 request.Method = "HEAD"; 186 request.Method = "HEAD";
187 request.Proxy = null;
187 188
188 using (WebResponse response = request.GetResponse()) 189 using (WebResponse response = request.GetResponse())
189 { 190 {
@@ -339,7 +340,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
339 // Simian does not require the asset ID to be in the URL because it's in the post data. 340 // Simian does not require the asset ID to be in the URL because it's in the post data.
340 // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs 341 // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs
341 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString()); 342 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString());
342 343 request.Proxy = null;
344
343 HttpWebResponse response = MultipartForm.Post(request, postParameters); 345 HttpWebResponse response = MultipartForm.Post(request, postParameters);
344 using (Stream responseStream = response.GetResponseStream()) 346 using (Stream responseStream = response.GetResponseStream())
345 { 347 {
@@ -427,6 +429,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
427 { 429 {
428 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url); 430 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
429 request.Method = "DELETE"; 431 request.Method = "DELETE";
432 request.Proxy = null;
430 433
431 using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) 434 using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
432 { 435 {
@@ -460,6 +463,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
460 try 463 try
461 { 464 {
462 HttpWebRequest request = UntrustedHttpWebRequest.Create(url); 465 HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
466 request.Proxy = null;
463 467
464 using (WebResponse response = request.GetResponse()) 468 using (WebResponse response = request.GetResponse())
465 { 469 {
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
212 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl); 212 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl);
213 request.Timeout = 20000; 213 request.Timeout = 20000;
214 request.ReadWriteTimeout = 5000; 214 request.ReadWriteTimeout = 5000;
215 request.Proxy = null;
215 216
216 using (HttpWebResponse response = MultipartForm.Post(request, postParameters)) 217 using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
217 { 218 {