aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2012-09-30 07:48:03 -0700
committerDiva Canto2012-09-30 07:48:03 -0700
commit91a5c602e313b96ffaf1d50b7f0d2923a2e141ba (patch)
tree3c76fe34e863fa990c6da0f72d8350c7476cf1e4
parentAdded request.Proxy=null everywhere, as discussed in http://stackoverflow.com... (diff)
downloadopensim-SC_OLD-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.zip
opensim-SC_OLD-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.tar.gz
opensim-SC_OLD-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.tar.bz2
opensim-SC_OLD-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.
-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, 8 insertions, 41 deletions
diff --git a/OpenSim/ConsoleClient/Requester.cs b/OpenSim/ConsoleClient/Requester.cs
index 0952e58..aabb02c 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;
50 request.Method = "POST"; 49 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 226e52f..97b3b60 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -306,7 +306,6 @@ 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;
310 _asyncException = null; 309 _asyncException = null;
311 310
312// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request); 311// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
@@ -366,7 +365,6 @@ namespace OpenSim.Framework.Communications
366 _request.ContentType = "application/xml"; 365 _request.ContentType = "application/xml";
367 _request.Timeout = 900000; 366 _request.Timeout = 900000;
368 _request.Method = RequestMethod; 367 _request.Method = RequestMethod;
369 _request.Proxy = null;
370 _asyncException = null; 368 _asyncException = null;
371 _request.ContentLength = src.Length; 369 _request.ContentLength = src.Length;
372 370
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index 7aaf776..3dce578 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -65,7 +65,6 @@ 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;
69 HttpWebResponse response = (HttpWebResponse) request.GetResponse(); 68 HttpWebResponse response = (HttpWebResponse) request.GetResponse();
70 69
71 Stream resStream = response.GetResponseStream(); 70 Stream resStream = response.GetResponseStream();
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index 96d4d59..a2f5d9c 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -70,7 +70,6 @@ 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;
74 m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url); 73 m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
75 74
76 try 75 try
diff --git a/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs b/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs
index 61161e3..48ced19 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs
@@ -50,7 +50,6 @@ 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;
54 request.ContentType = "text/xml"; 53 request.ContentType = "text/xml";
55 54
56 MemoryStream buffer = new MemoryStream(); 55 MemoryStream buffer = new MemoryStream();
diff --git a/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs b/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs
index 727f027..451745c 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs
@@ -57,7 +57,6 @@ 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;
61 request.ContentType = "text/xml"; 60 request.ContentType = "text/xml";
62 request.Timeout = 10000; 61 request.Timeout = 10000;
63 62
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index 1612d4a..19c03a8 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -74,7 +74,6 @@ 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;
78 request.ContentType = "text/xml"; 77 request.ContentType = "text/xml";
79 request.Timeout = 20000; 78 request.Timeout = 20000;
80 79
@@ -140,7 +139,6 @@ namespace OpenSim.Framework.Servers.HttpServer
140 139
141 WebRequest request = WebRequest.Create(requestUrl); 140 WebRequest request = WebRequest.Create(requestUrl);
142 request.Method = verb; 141 request.Method = verb;
143 request.Proxy = null;
144 request.ContentType = "text/xml"; 142 request.ContentType = "text/xml";
145 request.Timeout = 10000; 143 request.Timeout = 10000;
146 144
diff --git a/OpenSim/Framework/UntrustedWebRequest.cs b/OpenSim/Framework/UntrustedWebRequest.cs
index f2355b1..e6411cc 100644
--- a/OpenSim/Framework/UntrustedWebRequest.cs
+++ b/OpenSim/Framework/UntrustedWebRequest.cs
@@ -88,7 +88,6 @@ 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;
92 91
93 return httpWebRequest; 92 return httpWebRequest;
94 } 93 }
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 9eff0d2..1d9e2ce 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -171,7 +171,6 @@ 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;
175 request.MaximumAutomaticRedirections = 10; 174 request.MaximumAutomaticRedirections = 10;
176 request.ReadWriteTimeout = timeout / 4; 175 request.ReadWriteTimeout = timeout / 4;
177 request.Headers[OSHeaderRequestID] = reqnum.ToString(); 176 request.Headers[OSHeaderRequestID] = reqnum.ToString();
@@ -351,7 +350,6 @@ namespace OpenSim.Framework
351 request.Method = "POST"; 350 request.Method = "POST";
352 request.Timeout = timeout; 351 request.Timeout = timeout;
353 request.KeepAlive = false; 352 request.KeepAlive = false;
354 request.Proxy = null;
355 request.MaximumAutomaticRedirections = 10; 353 request.MaximumAutomaticRedirections = 10;
356 request.ReadWriteTimeout = timeout / 4; 354 request.ReadWriteTimeout = timeout / 4;
357 request.Headers[OSHeaderRequestID] = reqnum.ToString(); 355 request.Headers[OSHeaderRequestID] = reqnum.ToString();
@@ -732,7 +730,6 @@ namespace OpenSim.Framework
732 Type type = typeof(TRequest); 730 Type type = typeof(TRequest);
733 731
734 WebRequest request = WebRequest.Create(requestUrl); 732 WebRequest request = WebRequest.Create(requestUrl);
735 request.Proxy = null;
736 WebResponse response = null; 733 WebResponse response = null;
737 TResponse deserial = default(TResponse); 734 TResponse deserial = default(TResponse);
738 XmlSerializer deserializer = new XmlSerializer(typeof(TResponse)); 735 XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
@@ -927,7 +924,6 @@ namespace OpenSim.Framework
927 924
928 WebRequest request = WebRequest.Create(requestUrl); 925 WebRequest request = WebRequest.Create(requestUrl);
929 request.Method = verb; 926 request.Method = verb;
930 request.Proxy = null;
931 string respstring = String.Empty; 927 string respstring = String.Empty;
932 928
933 using (MemoryStream buffer = new MemoryStream()) 929 using (MemoryStream buffer = new MemoryStream())
@@ -1055,7 +1051,6 @@ namespace OpenSim.Framework
1055 1051
1056 WebRequest request = WebRequest.Create(requestUrl); 1052 WebRequest request = WebRequest.Create(requestUrl);
1057 request.Method = verb; 1053 request.Method = verb;
1058 request.Proxy = null;
1059 MemoryStream buffer = null; 1054 MemoryStream buffer = null;
1060 1055
1061 if ((verb == "POST") || (verb == "PUT")) 1056 if ((verb == "POST") || (verb == "PUT"))
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 2be91c0..d328eb3 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -384,7 +384,6 @@ 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;
388 387
389 if(!HttpVerifyCert) 388 if(!HttpVerifyCert)
390 { 389 {
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 5af3326..45e6527 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -148,21 +148,19 @@ 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;
166 164
167 RequestState state = new RequestState((HttpWebRequest) request, requestID); 165 RequestState state = new RequestState((HttpWebRequest) request, requestID);
168 // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); 166 // 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 9def6ee..b4e3d77 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -826,7 +826,6 @@ 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;
830//Ckrinke: Comment out for now as 'str' is unused. Bring it back into play later when it is used. 829//Ckrinke: Comment out for now as 'str' is unused. Bring it back into play later when it is used.
831//Ckrinke Stream str = null; 830//Ckrinke Stream str = null;
832 HttpWebResponse response = (HttpWebResponse)(request).GetResponse(); 831 HttpWebResponse response = (HttpWebResponse)(request).GetResponse();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
index ff8f119..c72acc3 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
@@ -110,7 +110,6 @@ 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;
114 113
115 WebResponse response = request.GetResponse(); 114 WebResponse response = request.GetResponse();
116 Stream file = response.GetResponseStream(); 115 Stream file = response.GetResponseStream();
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index c70031f..4694b14 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -352,7 +352,6 @@ 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;
356 355
357 WebResponse response = request.GetResponse(); 356 WebResponse response = request.GetResponse();
358 Stream file = response.GetResponseStream(); 357 Stream file = response.GetResponseStream();
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 0fdc5a8..dfba3ff 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -819,7 +819,6 @@ 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;
823 OSDMap RAMap = new OSDMap(); 822 OSDMap RAMap = new OSDMap();
824 823
825 // string RAMapString = RAMap.ToString(); 824 // string RAMapString = RAMap.ToString();
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
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
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;
81 // Eventually we need to switch to HEAD 80 // Eventually we need to switch to HEAD
82 /* req.Method = "HEAD"; */ 81 /* req.Method = "HEAD"; */
83 82
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
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;
129 //AgentCreateRequest.KeepAlive = false; 128 //AgentCreateRequest.KeepAlive = false;
130 //AgentCreateRequest.Headers.Add("Authorization", authKey); 129 //AgentCreateRequest.Headers.Add("Authorization", authKey);
131 130
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
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;
111 110
112 // Fill it in 111 // Fill it in
113 OSDMap args = null; 112 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
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;
188 187
189 using (WebResponse response = request.GetResponse()) 188 using (WebResponse response = request.GetResponse())
190 { 189 {
@@ -340,8 +339,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
340 // Simian does not require the asset ID to be in the URL because it's in the post data. 339 // Simian does not require the asset ID to be in the URL because it's in the post data.
341 // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs 340 // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs
342 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString()); 341 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString());
343 request.Proxy = null; 342
344
345 HttpWebResponse response = MultipartForm.Post(request, postParameters); 343 HttpWebResponse response = MultipartForm.Post(request, postParameters);
346 using (Stream responseStream = response.GetResponseStream()) 344 using (Stream responseStream = response.GetResponseStream())
347 { 345 {
@@ -429,7 +427,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
429 { 427 {
430 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url); 428 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
431 request.Method = "DELETE"; 429 request.Method = "DELETE";
432 request.Proxy = null;
433 430
434 using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) 431 using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
435 { 432 {
@@ -463,7 +460,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
463 try 460 try
464 { 461 {
465 HttpWebRequest request = UntrustedHttpWebRequest.Create(url); 462 HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
466 request.Proxy = null;
467 463
468 using (WebResponse response = request.GetResponse()) 464 using (WebResponse response = request.GetResponse())
469 { 465 {
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
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;
216 215
217 using (HttpWebResponse response = MultipartForm.Post(request, postParameters)) 216 using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
218 { 217 {