diff options
Diffstat (limited to '')
11 files changed, 6 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 2be91c0..d328eb3 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -384,7 +384,6 @@ 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; | ||
388 | 387 | ||
389 | if(!HttpVerifyCert) | 388 | if(!HttpVerifyCert) |
390 | { | 389 | { |
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); |
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index 9def6ee..b4e3d77 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||
@@ -826,7 +826,6 @@ 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; | ||
830 | //Ckrinke: Comment out for now as 'str' is unused. Bring it back into play later when it is used. | 829 | //Ckrinke: Comment out for now as 'str' is unused. Bring it back into play later when it is used. |
831 | //Ckrinke Stream str = null; | 830 | //Ckrinke Stream str = null; |
832 | HttpWebResponse response = (HttpWebResponse)(request).GetResponse(); | 831 | HttpWebResponse response = (HttpWebResponse)(request).GetResponse(); |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs index ff8f119..c72acc3 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs | |||
@@ -110,7 +110,6 @@ 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; | ||
114 | 113 | ||
115 | WebResponse response = request.GetResponse(); | 114 | WebResponse response = request.GetResponse(); |
116 | Stream file = response.GetResponseStream(); | 115 | Stream file = response.GetResponseStream(); |
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index c70031f..4694b14 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
@@ -352,7 +352,6 @@ 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; | ||
356 | 355 | ||
357 | WebResponse response = request.GetResponse(); | 356 | WebResponse response = request.GetResponse(); |
358 | Stream file = response.GetResponseStream(); | 357 | Stream file = response.GetResponseStream(); |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 0fdc5a8..dfba3ff 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -819,7 +819,6 @@ 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; | ||
823 | OSDMap RAMap = new OSDMap(); | 822 | OSDMap RAMap = new OSDMap(); |
824 | 823 | ||
825 | // string RAMapString = RAMap.ToString(); | 824 | // string RAMapString = RAMap.ToString(); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index fbbb60f..e22618d 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 | updatePost.Proxy = null; | 389 | |
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 8a5ce62..37ab35a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -541,7 +541,6 @@ 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; | ||
545 | 544 | ||
546 | if (method == "POST") | 545 | if (method == "POST") |
547 | { | 546 | { |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index f5d8e19..c5fcef4 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -1119,7 +1119,6 @@ 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; | ||
1123 | 1122 | ||
1124 | // Send request and retrieve the response | 1123 | // Send request and retrieve the response |
1125 | rsp = (HttpWebResponse)req.GetResponse(); | 1124 | rsp = (HttpWebResponse)req.GetResponse(); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index 5102115..d412cd1 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | |||
@@ -1150,7 +1150,6 @@ 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; | ||
1154 | 1153 | ||
1155 | Stream stream = request.GetRequestStream(); | 1154 | Stream stream = request.GetRequestStream(); |
1156 | XmlTextWriter xml = new XmlTextWriter(stream, Encoding.ASCII); | 1155 | 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 3e476ce..bad75f7 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
@@ -280,7 +280,6 @@ 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; | ||
284 | 283 | ||
285 | Stream os = null; | 284 | Stream os = null; |
286 | try | 285 | try |