diff options
author | Diva Canto | 2012-09-30 07:48:03 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-30 07:48:03 -0700 |
commit | 91a5c602e313b96ffaf1d50b7f0d2923a2e141ba (patch) | |
tree | 3c76fe34e863fa990c6da0f72d8350c7476cf1e4 /OpenSim/Services/Connectors | |
parent | Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com... (diff) | |
download | opensim-SC-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.zip opensim-SC-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.tar.gz opensim-SC-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.tar.bz2 opensim-SC-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.
Diffstat (limited to 'OpenSim/Services/Connectors')
5 files changed, 1 insertions, 9 deletions
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 | { |