aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-11-23 04:15:21 +0000
committerJustin Clark-Casey (justincc)2012-11-23 04:15:21 +0000
commit065d6d6fe1c8cd010d2bf0e68d6a2a926b17fc5c (patch)
tree7fdc41f66e4aa7ec98948b0617cd85d8d3e80be4 /OpenSim/Framework/Servers
parentEnable further client stack packet pooling by default by setting RecycleBaseU... (diff)
downloadopensim-SC_OLD-065d6d6fe1c8cd010d2bf0e68d6a2a926b17fc5c.zip
opensim-SC_OLD-065d6d6fe1c8cd010d2bf0e68d6a2a926b17fc5c.tar.gz
opensim-SC_OLD-065d6d6fe1c8cd010d2bf0e68d6a2a926b17fc5c.tar.bz2
opensim-SC_OLD-065d6d6fe1c8cd010d2bf0e68d6a2a926b17fc5c.tar.xz
Delete unused BaseHttpServer.HandleAgentRequest()
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs53
1 files changed, 0 insertions, 53 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 66d80cf..2cd626f 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1282,59 +1282,6 @@ namespace OpenSim.Framework.Servers.HttpServer
1282 map["login"] = OSD.FromString("false"); 1282 map["login"] = OSD.FromString("false");
1283 return map; 1283 return map;
1284 } 1284 }
1285 /// <summary>
1286 /// A specific agent handler was provided. Such a handler is expecetd to have an
1287 /// intimate, and highly specific relationship with the client. Consequently,
1288 /// nothing is done here.
1289 /// </summary>
1290 /// <param name="handler"></param>
1291 /// <param name="request"></param>
1292 /// <param name="response"></param>
1293
1294 private bool HandleAgentRequest(IHttpAgentHandler handler, OSHttpRequest request, OSHttpResponse response)
1295 {
1296 // In the case of REST, then handler is responsible for ALL aspects of
1297 // the request/response handling. Nothing is done here, not even encoding.
1298
1299 try
1300 {
1301 return handler.Handle(request, response);
1302 }
1303 catch (Exception e)
1304 {
1305 // If the handler did in fact close the stream, then this will blow
1306 // chunks. So that that doesn't disturb anybody we throw away any
1307 // and all exceptions raised. We've done our best to release the
1308 // client.
1309 try
1310 {
1311 m_log.Warn("[HTTP-AGENT]: Error - " + e.Message);
1312 response.SendChunked = false;
1313 response.KeepAlive = true;
1314 response.StatusCode = (int)OSHttpStatusCode.ServerErrorInternalError;
1315 //response.OutputStream.Close();
1316 try
1317 {
1318 response.Send();
1319 //response.FreeContext();
1320 }
1321 catch (SocketException f)
1322 {
1323 // This has to be here to prevent a Linux/Mono crash
1324 m_log.Warn(
1325 String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", f.Message), f);
1326 }
1327 }
1328 catch(Exception)
1329 {
1330 }
1331 }
1332
1333 // Indicate that the request has been "handled"
1334
1335 return true;
1336
1337 }
1338 1285
1339 public byte[] HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response) 1286 public byte[] HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
1340 { 1287 {