Diva Canto
2012-09-30 07:22:55 -07:00
parent 14a4b146bf
commit 531edd51d8
25 changed files with 41 additions and 8 deletions

View File

@@ -77,6 +77,7 @@ namespace OpenSim.Services.Connectors
public virtual string Helo()
{
HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
req.Proxy = null;
// Eventually we need to switch to HEAD
/* req.Method = "HEAD"; */

View File

@@ -125,6 +125,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
AgentCreateRequest.Method = "POST";
AgentCreateRequest.ContentType = "application/json";
AgentCreateRequest.Timeout = 10000;
AgentCreateRequest.Proxy = null;
//AgentCreateRequest.KeepAlive = false;
//AgentCreateRequest.Headers.Add("Authorization", authKey);

View File

@@ -107,6 +107,7 @@ namespace OpenSim.Services.Connectors
helloNeighbourRequest.Method = "POST";
helloNeighbourRequest.ContentType = "application/json";
helloNeighbourRequest.Timeout = 10000;
helloNeighbourRequest.Proxy = null;
// Fill it in
OSDMap args = null;

View File

@@ -184,6 +184,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
request.Method = "HEAD";
request.Proxy = null;
using (WebResponse response = request.GetResponse())
{
@@ -339,7 +340,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
// Simian does not require the asset ID to be in the URL because it's in the post data.
// By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs
HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString());
request.Proxy = null;
HttpWebResponse response = MultipartForm.Post(request, postParameters);
using (Stream responseStream = response.GetResponseStream())
{
@@ -427,6 +429,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
request.Method = "DELETE";
request.Proxy = null;
using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
{
@@ -460,6 +463,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
try
{
HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
request.Proxy = null;
using (WebResponse response = request.GetResponse())
{

View File

@@ -212,6 +212,7 @@ namespace OpenSim.Region.OptionalModules.Simian
HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl);
request.Timeout = 20000;
request.ReadWriteTimeout = 5000;
request.Proxy = null;
using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
{