aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
diff options
context:
space:
mode:
authorDiva Canto2012-09-30 07:22:55 -0700
committerDiva Canto2012-09-30 07:22:55 -0700
commit531edd51d82ecd6a842a2611c99e9919634491ef (patch)
tree0e28069aa1b2278f91b9275f98db7990abb7d964 /OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-531edd51d82ecd6a842a2611c99e9919634491ef.zip
opensim-SC-531edd51d82ecd6a842a2611c99e9919634491ef.tar.gz
opensim-SC-531edd51d82ecd6a842a2611c99e9919634491ef.tar.bz2
opensim-SC-531edd51d82ecd6a842a2611c99e9919634491ef.tar.xz
Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow.
Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 45e6527..5af3326 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -148,19 +148,21 @@ 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;
164 166
165 RequestState state = new RequestState((HttpWebRequest) request, requestID); 167 RequestState state = new RequestState((HttpWebRequest) request, requestID);
166 // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); 168 // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state);