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/Region/CoreModules/Scripting/LoadImageURL | |
parent | Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com... (diff) | |
download | opensim-SC_OLD-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.zip opensim-SC_OLD-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.tar.gz opensim-SC_OLD-91a5c602e313b96ffaf1d50b7f0d2923a2e141ba.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs index 5af3326..45e6527 100644 --- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | |||
@@ -148,21 +148,19 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL | |||
148 | private void MakeHttpRequest(string url, UUID requestID) | 148 | private void MakeHttpRequest(string url, UUID requestID) |
149 | { | 149 | { |
150 | WebRequest request = HttpWebRequest.Create(url); | 150 | WebRequest request = HttpWebRequest.Create(url); |
151 | 151 | ||
152 | if (m_proxyurl != null && m_proxyurl.Length > 0) | 152 | if (m_proxyurl != null && m_proxyurl.Length > 0) |
153 | { | 153 | { |
154 | if (m_proxyexcepts != null && m_proxyexcepts.Length > 0) | 154 | if (m_proxyexcepts != null && m_proxyexcepts.Length > 0) |
155 | { | 155 | { |
156 | string[] elist = m_proxyexcepts.Split(';'); | 156 | string[] elist = m_proxyexcepts.Split(';'); |
157 | request.Proxy = new WebProxy(m_proxyurl, true, elist); | 157 | request.Proxy = new WebProxy(m_proxyurl, true, elist); |
158 | } | 158 | } |
159 | else | 159 | else |
160 | { | 160 | { |
161 | request.Proxy = new WebProxy(m_proxyurl, true); | 161 | request.Proxy = new WebProxy(m_proxyurl, true); |
162 | } | 162 | } |
163 | } | 163 | } |
164 | else | ||
165 | request.Proxy = null; | ||
166 | 164 | ||
167 | RequestState state = new RequestState((HttpWebRequest) request, requestID); | 165 | RequestState state = new RequestState((HttpWebRequest) request, requestID); |
168 | // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); | 166 | // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); |