Merge branch 'master' into careminster

1 files changed, 27 insertions, 13 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 31af44c..1d5b426 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -53,6 +53,8 @@ namespace OpenSim.Framework.Servers.HttpServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private HttpServerLogWriter httpserverlog = new HttpServerLogWriter();
 
+        public int DebugLevel { get; set; }
+
         private volatile int NotSocketErrors = 0;
         public volatile bool HTTPDRunning = false;
 
@@ -79,11 +81,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private PollServiceRequestManager m_PollServiceManager;
 
-        /// <summary>
-        /// Control the printing of certain debug messages.
-        /// </summary>
-        public int DebugLevel { get; set; }
-
         public uint SSLPort
         {
             get { return m_sslport; }
@@ -450,7 +447,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                 if (TryGetStreamHandler(handlerKey, out requestHandler))
                 {
-                    if (DebugLevel >= 1)
+                    if (DebugLevel >= 3)
                         m_log.DebugFormat(
                             "[BASE HTTP SERVER]: Found stream handler for {0} {1} {2} {3}",
                             request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description);
@@ -531,7 +528,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         case null:
                         case "text/html":
     
-                            if (DebugLevel >= 1)
+                            if (DebugLevel >= 3)
                                 m_log.DebugFormat(
                                     "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
                                     request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
@@ -543,7 +540,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         case "application/xml+llsd":
                         case "application/llsd+json":
     
-                            if (DebugLevel >= 1)
+                            if (DebugLevel >= 3)
                                 m_log.DebugFormat(
                                     "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
                                     request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
@@ -564,7 +561,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             //m_log.Info("[Debug BASE HTTP SERVER]: Checking for LLSD Handler");
                             if (DoWeHaveALLSDHandler(request.RawUrl))
                             {
-                                if (DebugLevel >= 1)
+                                if (DebugLevel >= 3)
                                     m_log.DebugFormat(
                                         "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
                                         request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
@@ -574,7 +571,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     //                        m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
                             else if (DoWeHaveAHTTPHandler(request.RawUrl))
                             {
-                                if (DebugLevel >= 1)
+                                if (DebugLevel >= 3)
                                     m_log.DebugFormat(
                                         "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
                                         request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
@@ -583,8 +580,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             }
                             else
                             {
-    
-                                if (DebugLevel >= 1)
+                                if (DebugLevel >= 3)
                                     m_log.DebugFormat(
                                         "[BASE HTTP SERVER]: Assuming a generic XMLRPC request for {0} {1}",
                                         request.HttpMethod, request.Url.PathAndQuery);
@@ -793,8 +789,23 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody);
             }
-            catch (XmlException)
+            catch (XmlException e)
             {
+                if (DebugLevel >= 1)
+                {
+                    if (DebugLevel >= 2)
+                        m_log.Warn(
+                            string.Format(
+                                "[BASE HTTP SERVER]: Got XMLRPC request with invalid XML from {0}.  XML was '{1}'.  Sending blank response.  Exception ",
+                                request.RemoteIPEndPoint, requestBody),
+                            e);
+                    else
+                    {
+                        m_log.WarnFormat(
+                            "[BASE HTTP SERVER]: Got XMLRPC request with invalid XML from {0}, length {1}.  Sending blank response.",
+                            request.RemoteIPEndPoint, requestBody.Length);
+                    }
+                }
             }
 
             if (xmlRprcRequest != null)
@@ -1570,6 +1581,9 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private void StartHTTP()
         {
+            m_log.InfoFormat(
+                "[BASE HTTP SERVER]: Starting {0} server on port {1}", UseSSL ? "HTTPS" : "HTTP", Port);
+
             try
             {
                 //m_httpListener = new HttpListener();