aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
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
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.zip
opensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.tar.gz
opensim-SC_OLD-531edd51d82ecd6a842a2611c99e9919634491ef.tar.bz2
opensim-SC_OLD-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')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs1
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs12
-rw-r--r--OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs1
11 files changed, 17 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index d328eb3..2be91c0 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -384,6 +384,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
384 Request = (HttpWebRequest) WebRequest.Create(Url); 384 Request = (HttpWebRequest) WebRequest.Create(Url);
385 Request.Method = HttpMethod; 385 Request.Method = HttpMethod;
386 Request.ContentType = HttpMIMEType; 386 Request.ContentType = HttpMIMEType;
387 Request.Proxy = null;
387 388
388 if(!HttpVerifyCert) 389 if(!HttpVerifyCert)
389 { 390 {
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);
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index b4e3d77..9def6ee 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -826,6 +826,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
826 try 826 try
827 { 827 {
828 WebRequest request = HttpWebRequest.Create(url); 828 WebRequest request = HttpWebRequest.Create(url);
829 request.Proxy = null;
829//Ckrinke: Comment out for now as 'str' is unused. Bring it back into play later when it is used. 830//Ckrinke: Comment out for now as 'str' is unused. Bring it back into play later when it is used.
830//Ckrinke Stream str = null; 831//Ckrinke Stream str = null;
831 HttpWebResponse response = (HttpWebResponse)(request).GetResponse(); 832 HttpWebResponse response = (HttpWebResponse)(request).GetResponse();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
index c72acc3..ff8f119 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
@@ -110,6 +110,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
110 110
111 request.ContentLength = 0; 111 request.ContentLength = 0;
112 request.KeepAlive = false; 112 request.KeepAlive = false;
113 request.Proxy = null;
113 114
114 WebResponse response = request.GetResponse(); 115 WebResponse response = request.GetResponse();
115 Stream file = response.GetResponseStream(); 116 Stream file = response.GetResponseStream();
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 4694b14..c70031f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -352,6 +352,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
352 352
353 request.ContentLength = 0; 353 request.ContentLength = 0;
354 request.KeepAlive = false; 354 request.KeepAlive = false;
355 request.Proxy = null;
355 356
356 WebResponse response = request.GetResponse(); 357 WebResponse response = request.GetResponse();
357 Stream file = response.GetResponseStream(); 358 Stream file = response.GetResponseStream();
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index dfba3ff..0fdc5a8 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -819,6 +819,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
819 819
820 mapitemsrequest.Method = "POST"; 820 mapitemsrequest.Method = "POST";
821 mapitemsrequest.ContentType = "application/xml+llsd"; 821 mapitemsrequest.ContentType = "application/xml+llsd";
822 mapitemsrequest.Proxy = null;
822 OSDMap RAMap = new OSDMap(); 823 OSDMap RAMap = new OSDMap();
823 824
824 // string RAMapString = RAMap.ToString(); 825 // string RAMapString = RAMap.ToString();
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index e22618d..fbbb60f 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -386,7 +386,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
386 updatePost.ContentType = "text/xml"; 386 updatePost.ContentType = "text/xml";
387 updatePost.ContentLength = payload.Length; 387 updatePost.ContentLength = payload.Length;
388 updatePost.UserAgent = "OpenSim.Concierge"; 388 updatePost.UserAgent = "OpenSim.Concierge";
389 389 updatePost.Proxy = null;
390 390
391 BrokerState bs = new BrokerState(uri, payload, updatePost); 391 BrokerState bs = new BrokerState(uri, payload, updatePost);
392 bs.Timer = new Timer(delegate(object state) 392 bs.Timer = new Timer(delegate(object state)
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 37ab35a..8a5ce62 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -541,6 +541,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
541 forwardreq.Method = method; 541 forwardreq.Method = method;
542 forwardreq.ContentType = contenttype; 542 forwardreq.ContentType = contenttype;
543 forwardreq.KeepAlive = false; 543 forwardreq.KeepAlive = false;
544 forwardreq.Proxy = null;
544 545
545 if (method == "POST") 546 if (method == "POST")
546 { 547 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index c5fcef4..f5d8e19 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -1119,6 +1119,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1119 1119
1120 // We are sending just parameters, no content 1120 // We are sending just parameters, no content
1121 req.ContentLength = 0; 1121 req.ContentLength = 0;
1122 req.Proxy = null;
1122 1123
1123 // Send request and retrieve the response 1124 // Send request and retrieve the response
1124 rsp = (HttpWebResponse)req.GetResponse(); 1125 rsp = (HttpWebResponse)req.GetResponse();
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index d412cd1..5102115 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -1150,6 +1150,7 @@ namespace Nwc.XmlRpc
1150 request.ContentType = "text/xml"; 1150 request.ContentType = "text/xml";
1151 request.AllowWriteStreamBuffering = true; 1151 request.AllowWriteStreamBuffering = true;
1152 request.KeepAlive = !_disableKeepAlive; 1152 request.KeepAlive = !_disableKeepAlive;
1153 request.Proxy = null;
1153 1154
1154 Stream stream = request.GetRequestStream(); 1155 Stream stream = request.GetRequestStream();
1155 XmlTextWriter xml = new XmlTextWriter(stream, Encoding.ASCII); 1156 XmlTextWriter xml = new XmlTextWriter(stream, Encoding.ASCII);
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index bad75f7..3e476ce 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -280,6 +280,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
280 WebRequest request = WebRequest.Create(m_uri); 280 WebRequest request = WebRequest.Create(m_uri);
281 request.Method = request_method; 281 request.Method = request_method;
282 request.ContentType = content_type; 282 request.ContentType = content_type;
283 request.Proxy = null;
283 284
284 Stream os = null; 285 Stream os = null;
285 try 286 try