aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs36
1 files changed, 31 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index f57ea76..e45cb89 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1448,10 +1448,34 @@ namespace OpenSim.Framework.Servers.HttpServer
1448 1448
1449 internal byte[] DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response) 1449 internal byte[] DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response)
1450 { 1450 {
1451 //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response"); 1451 int responsecode;
1452 int responsecode = (int)responsedata["int_response_code"]; 1452 string responseString;
1453 string responseString = (string)responsedata["str_response_string"]; 1453 string contentType;
1454 string contentType = (string)responsedata["content_type"]; 1454
1455 if (responsedata == null)
1456 {
1457 responsecode = 500;
1458 responseString = "No response could be obtained";
1459 contentType = "text/plain";
1460 responsedata = new Hashtable();
1461 }
1462 else
1463 {
1464 try
1465 {
1466 //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
1467 responsecode = (int)responsedata["int_response_code"];
1468 responseString = (string)responsedata["str_response_string"];
1469 contentType = (string)responsedata["content_type"];
1470 }
1471 catch
1472 {
1473 responsecode = 500;
1474 responseString = "No response could be obtained";
1475 contentType = "text/plain";
1476 responsedata = new Hashtable();
1477 }
1478 }
1455 1479
1456 if (responsedata.ContainsKey("error_status_text")) 1480 if (responsedata.ContainsKey("error_status_text"))
1457 { 1481 {
@@ -1628,7 +1652,9 @@ namespace OpenSim.Framework.Servers.HttpServer
1628 1652
1629 public void httpServerException(object source, Exception exception) 1653 public void httpServerException(object source, Exception exception)
1630 { 1654 {
1631 m_log.Error(String.Format("[BASE HTTP SERVER]: {0} had an exception: {1} ", source.ToString(), exception.Message), exception); 1655 if (source.ToString() == "HttpServer.HttpListener" && exception.ToString().StartsWith("Mono.Security.Protocol.Tls.TlsException"))
1656 return;
1657 m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
1632 /* 1658 /*
1633 if (HTTPDRunning)// && NotSocketErrors > 5) 1659 if (HTTPDRunning)// && NotSocketErrors > 5)
1634 { 1660 {