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/Framework/WebUtil.cs | |
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/Framework/WebUtil.cs')
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 9eff0d2..1d9e2ce 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -171,7 +171,6 @@ namespace OpenSim.Framework | |||
171 | request.Method = method; | 171 | request.Method = method; |
172 | request.Timeout = timeout; | 172 | request.Timeout = timeout; |
173 | request.KeepAlive = false; | 173 | request.KeepAlive = false; |
174 | request.Proxy = null; | ||
175 | request.MaximumAutomaticRedirections = 10; | 174 | request.MaximumAutomaticRedirections = 10; |
176 | request.ReadWriteTimeout = timeout / 4; | 175 | request.ReadWriteTimeout = timeout / 4; |
177 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); | 176 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); |
@@ -351,7 +350,6 @@ namespace OpenSim.Framework | |||
351 | request.Method = "POST"; | 350 | request.Method = "POST"; |
352 | request.Timeout = timeout; | 351 | request.Timeout = timeout; |
353 | request.KeepAlive = false; | 352 | request.KeepAlive = false; |
354 | request.Proxy = null; | ||
355 | request.MaximumAutomaticRedirections = 10; | 353 | request.MaximumAutomaticRedirections = 10; |
356 | request.ReadWriteTimeout = timeout / 4; | 354 | request.ReadWriteTimeout = timeout / 4; |
357 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); | 355 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); |
@@ -732,7 +730,6 @@ namespace OpenSim.Framework | |||
732 | Type type = typeof(TRequest); | 730 | Type type = typeof(TRequest); |
733 | 731 | ||
734 | WebRequest request = WebRequest.Create(requestUrl); | 732 | WebRequest request = WebRequest.Create(requestUrl); |
735 | request.Proxy = null; | ||
736 | WebResponse response = null; | 733 | WebResponse response = null; |
737 | TResponse deserial = default(TResponse); | 734 | TResponse deserial = default(TResponse); |
738 | XmlSerializer deserializer = new XmlSerializer(typeof(TResponse)); | 735 | XmlSerializer deserializer = new XmlSerializer(typeof(TResponse)); |
@@ -927,7 +924,6 @@ namespace OpenSim.Framework | |||
927 | 924 | ||
928 | WebRequest request = WebRequest.Create(requestUrl); | 925 | WebRequest request = WebRequest.Create(requestUrl); |
929 | request.Method = verb; | 926 | request.Method = verb; |
930 | request.Proxy = null; | ||
931 | string respstring = String.Empty; | 927 | string respstring = String.Empty; |
932 | 928 | ||
933 | using (MemoryStream buffer = new MemoryStream()) | 929 | using (MemoryStream buffer = new MemoryStream()) |
@@ -1055,7 +1051,6 @@ namespace OpenSim.Framework | |||
1055 | 1051 | ||
1056 | WebRequest request = WebRequest.Create(requestUrl); | 1052 | WebRequest request = WebRequest.Create(requestUrl); |
1057 | request.Method = verb; | 1053 | request.Method = verb; |
1058 | request.Proxy = null; | ||
1059 | MemoryStream buffer = null; | 1054 | MemoryStream buffer = null; |
1060 | 1055 | ||
1061 | if ((verb == "POST") || (verb == "PUT")) | 1056 | if ((verb == "POST") || (verb == "PUT")) |