aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
diff options
context:
space:
mode:
authorDiva Canto2012-09-30 07:22:55 -0700
committerDiva Canto2012-09-30 07:22:55 -0700
commit531edd51d82ecd6a842a2611c99e9919634491ef (patch)
tree0e28069aa1b2278f91b9275f98db7990abb7d964 /OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.zip
opensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.tar.gz
opensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.tar.bz2
opensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.tar.xz
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
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs6
1 files changed, 5 insertions, 1 deletions
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 {