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