ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."

Browse Source 
But the patch is here, in case anyone wants to try it.

This reverts commit 531edd51d8.
This commit is contained in:
Diva Canto
2012-09-30 07:48:03 -07:00
parent 531edd51d8
commit 91a5c602e3
25 changed files with 8 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/RestClient.cs
View File

@@ -306,7 +306,6 @@ namespace OpenSim.Framework.Communications
_request.ContentType = "application/xml";
_request.Timeout = 200000;
_request.Method = RequestMethod;
_request.Proxy = null;
_asyncException = null;
// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
@@ -366,7 +365,6 @@ namespace OpenSim.Framework.Communications
_request.ContentType = "application/xml";
_request.Timeout = 900000;
_request.Method = RequestMethod;
_request.Proxy = null;
_asyncException = null;
_request.ContentLength = src.Length;

1
OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
View File

@@ -65,7 +65,6 @@ namespace OpenSim.Framework.Configuration.HTTP
byte[] buf = new byte[8192];
HttpWebRequest request =
(HttpWebRequest) WebRequest.Create(remoteConfigSettings.baseConfigURL + configFileName);
request.Proxy = null;
HttpWebResponse response = (HttpWebResponse) request.GetResponse();
Stream resStream = response.GetResponseStream();

1
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
View File

@@ -70,7 +70,6 @@ namespace OpenSim.Framework.RegionLoader.Web
int regionCount = 0;
HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
webRequest.Timeout = 30000; //30 Second Timeout
webRequest.Proxy = null;
m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
try

1
OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs
View File

@@ -50,7 +50,6 @@ namespace OpenSim.Framework.Servers.HttpServer
WebRequest request = WebRequest.Create(requestUrl);
request.Method = verb;
request.Proxy = null;
request.ContentType = "text/xml";
MemoryStream buffer = new MemoryStream();

1
OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs
View File

@@ -57,7 +57,6 @@ namespace OpenSim.Framework.Servers.HttpServer
WebRequest request = WebRequest.Create(requestUrl);
request.Method = verb;
request.Proxy = null;
request.ContentType = "text/xml";
request.Timeout = 10000;

2
OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
View File

@@ -74,7 +74,6 @@ namespace OpenSim.Framework.Servers.HttpServer
WebRequest request = WebRequest.Create(requestUrl);
request.Method = verb;
request.Proxy = null;
request.ContentType = "text/xml";
request.Timeout = 20000;
@@ -140,7 +139,6 @@ namespace OpenSim.Framework.Servers.HttpServer
WebRequest request = WebRequest.Create(requestUrl);
request.Method = verb;
request.Proxy = null;
request.ContentType = "text/xml";
request.Timeout = 10000;

1
OpenSim/Framework/UntrustedWebRequest.cs
View File

@@ -88,7 +88,6 @@ namespace OpenSim.Framework
httpWebRequest.ReadWriteTimeout = readWriteTimeoutMS;
httpWebRequest.Timeout = timeoutMS;
httpWebRequest.KeepAlive = false;
httpWebRequest.Proxy = null;
return httpWebRequest;
}

5
OpenSim/Framework/WebUtil.cs
View File

@@ -171,7 +171,6 @@ namespace OpenSim.Framework
request.Method = method;
request.Timeout = timeout;
request.KeepAlive = false;
request.Proxy = null;
request.MaximumAutomaticRedirections = 10;
request.ReadWriteTimeout = timeout / 4;
request.Headers[OSHeaderRequestID] = reqnum.ToString();
@@ -351,7 +350,6 @@ namespace OpenSim.Framework
request.Method = "POST";
request.Timeout = timeout;
request.KeepAlive = false;
request.Proxy = null;
request.MaximumAutomaticRedirections = 10;
request.ReadWriteTimeout = timeout / 4;
request.Headers[OSHeaderRequestID] = reqnum.ToString();
@@ -732,7 +730,6 @@ namespace OpenSim.Framework
Type type = typeof(TRequest);
WebRequest request = WebRequest.Create(requestUrl);
request.Proxy = null;
WebResponse response = null;
TResponse deserial = default(TResponse);
XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
@@ -927,7 +924,6 @@ namespace OpenSim.Framework
WebRequest request = WebRequest.Create(requestUrl);
request.Method = verb;
request.Proxy = null;
string respstring = String.Empty;
using (MemoryStream buffer = new MemoryStream())
@@ -1055,7 +1051,6 @@ namespace OpenSim.Framework
WebRequest request = WebRequest.Create(requestUrl);
request.Method = verb;
request.Proxy = null;
MemoryStream buffer = null;
if ((verb == "POST") || (verb == "PUT"))