diff options
author | Diva Canto | 2011-04-30 17:40:21 -0700 |
---|---|---|
committer | Diva Canto | 2011-04-30 17:40:21 -0700 |
commit | 91a604d4b6822130871f35ddbc2c53f3468c2a01 (patch) | |
tree | eea41d6b9de5c4993a83ee7852545fc38585164f /OpenSim/Framework/WebUtil.cs | |
parent | XXX DEBUGGING! (diff) | |
download | opensim-SC-91a604d4b6822130871f35ddbc2c53f3468c2a01.zip opensim-SC-91a604d4b6822130871f35ddbc2c53f3468c2a01.tar.gz opensim-SC-91a604d4b6822130871f35ddbc2c53f3468c2a01.tar.bz2 opensim-SC-91a604d4b6822130871f35ddbc2c53f3468c2a01.tar.xz |
Removed XXX Debug. Increased ReadWriteTimeout on ServiceOSDRequest, because it was _way_ too low and is probably making writes abort in the middle.
Diffstat (limited to 'OpenSim/Framework/WebUtil.cs')
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 5449a6f..f6fed33 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -171,24 +171,15 @@ namespace OpenSim.Framework | |||
171 | request.Timeout = timeout; | 171 | request.Timeout = timeout; |
172 | request.KeepAlive = false; | 172 | request.KeepAlive = false; |
173 | request.MaximumAutomaticRedirections = 10; | 173 | request.MaximumAutomaticRedirections = 10; |
174 | request.ReadWriteTimeout = timeout / 4; | 174 | request.ReadWriteTimeout = timeout * 8; |
175 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); | 175 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); |
176 | 176 | ||
177 | // If there is some input, write it into the request | 177 | // If there is some input, write it into the request |
178 | if (data != null) | 178 | if (data != null) |
179 | { | 179 | { |
180 | string strBuffer = string.Empty; | 180 | string strBuffer = OSDParser.SerializeJsonString(data); |
181 | try | ||
182 | { | ||
183 | strBuffer = OSDParser.SerializeJsonString(data); | ||
184 | } | ||
185 | catch (Exception e) | ||
186 | { | ||
187 | m_log.DebugFormat("[WEB UTIL]: Exception serializing data {0}", e.Message); | ||
188 | throw e; | ||
189 | } | ||
190 | byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer); | 181 | byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer); |
191 | 182 | ||
192 | request.ContentType = "application/json"; | 183 | request.ContentType = "application/json"; |
193 | request.ContentLength = buffer.Length; //Count bytes to send | 184 | request.ContentLength = buffer.Length; //Count bytes to send |
194 | using (Stream requestStream = request.GetRequestStream()) | 185 | using (Stream requestStream = request.GetRequestStream()) |