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/World | |
| 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 'OpenSim/Region/CoreModules/World')
3 files changed, 0 insertions, 3 deletions
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(); |