aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services')
-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
5 files changed, 9 insertions, 1 deletions
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 {