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/Framework/Servers | |
| 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/Framework/Servers')
3 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs b/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs index 61161e3..48ced19 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs | |||
| @@ -50,7 +50,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 50 | 50 | ||
| 51 | WebRequest request = WebRequest.Create(requestUrl); | 51 | WebRequest request = WebRequest.Create(requestUrl); |
| 52 | request.Method = verb; | 52 | request.Method = verb; |
| 53 | request.Proxy = null; | ||
| 54 | request.ContentType = "text/xml"; | 53 | request.ContentType = "text/xml"; |
| 55 | 54 | ||
| 56 | MemoryStream buffer = new MemoryStream(); | 55 | MemoryStream buffer = new MemoryStream(); |
diff --git a/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs b/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs index 727f027..451745c 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs | |||
| @@ -57,7 +57,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 57 | 57 | ||
| 58 | WebRequest request = WebRequest.Create(requestUrl); | 58 | WebRequest request = WebRequest.Create(requestUrl); |
| 59 | request.Method = verb; | 59 | request.Method = verb; |
| 60 | request.Proxy = null; | ||
| 61 | request.ContentType = "text/xml"; | 60 | request.ContentType = "text/xml"; |
| 62 | request.Timeout = 10000; | 61 | request.Timeout = 10000; |
| 63 | 62 | ||
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs index 1612d4a..19c03a8 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs | |||
| @@ -74,7 +74,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 74 | 74 | ||
| 75 | WebRequest request = WebRequest.Create(requestUrl); | 75 | WebRequest request = WebRequest.Create(requestUrl); |
| 76 | request.Method = verb; | 76 | request.Method = verb; |
| 77 | request.Proxy = null; | ||
| 78 | request.ContentType = "text/xml"; | 77 | request.ContentType = "text/xml"; |
| 79 | request.Timeout = 20000; | 78 | request.Timeout = 20000; |
| 80 | 79 | ||
| @@ -140,7 +139,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 140 | 139 | ||
| 141 | WebRequest request = WebRequest.Create(requestUrl); | 140 | WebRequest request = WebRequest.Create(requestUrl); |
| 142 | request.Method = verb; | 141 | request.Method = verb; |
| 143 | request.Proxy = null; | ||
| 144 | request.ContentType = "text/xml"; | 142 | request.ContentType = "text/xml"; |
| 145 | request.Timeout = 10000; | 143 | request.Timeout = 10000; |
| 146 | 144 | ||