10 files changed, 353 insertions, 191 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHTTPHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseHTTPHandler.cs
index 2fe9769..9f8f4a8 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHTTPHandler.cs
@@ -33,9 +33,9 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         public abstract Hashtable Handle(string path, Hashtable Request);
 
-        protected BaseHTTPHandler(string httpMethod, string path)
-            : base(httpMethod, path)
-        {
-        }
+        protected BaseHTTPHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
+
+        protected BaseHTTPHandler(string httpMethod, string path, string name, string description)
+            : base(httpMethod, path, name, description) {}
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index ad5af1f..f5addc8 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
-        public List<string>  GetStreamHandlerKeys()
+        public List<string> GetStreamHandlerKeys()
         {
             lock (m_streamHandlers)
                 return new List<string>(m_streamHandlers.Keys);
@@ -356,7 +356,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: OnRequest() failed: {0} ", e.Message), e);
             }
         }
 
@@ -410,6 +410,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 //            string reqnum = "unknown";
             int tickstart = Environment.TickCount;
 
+            IRequestHandler requestHandler = null;
+
             try
             {
                 // OpenSim.Framework.WebUtil.OSHeaderRequestID
@@ -438,8 +440,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                 //response.KeepAlive = true;
                 response.SendChunked = false;
 
-                IRequestHandler requestHandler;
-
                 string path = request.RawUrl;
                 string handlerKey = GetHandlerKey(request.HttpMethod, path);
 
@@ -447,8 +447,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     if (DebugLevel >= 1)
                         m_log.DebugFormat(
-                            "[BASE HTTP SERVER]: Found stream handler for {0} {1}",
-                            request.HttpMethod, request.Url.PathAndQuery);
+                            "[BASE HTTP SERVER]: Found stream handler for {0} {1} {2} {3}",
+                            request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description);
 
                     // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
                     byte[] buffer = null;
@@ -551,11 +551,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                     catch (SocketException e)
                     {
                         // This has to be here to prevent a Linux/Mono crash
-                        m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                        m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                     }
                     catch (IOException e)
                     {
-                        m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                        m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}. ", e.Message), e);
                     }
 
                     return;
@@ -658,15 +658,15 @@ namespace OpenSim.Framework.Servers.HttpServer
                 //
                 // An alternative may be to turn off all response write exceptions on the HttpListener, but let's go
                 // with the minimum first
-                m_log.WarnFormat("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux", e);
+                m_log.Warn(String.Format("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux ", e.Message), e);
             }
             catch (IOException e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}", e);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}", e.StackTrace);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
                 SendHTML500(response);
             }
             finally
@@ -675,8 +675,16 @@ namespace OpenSim.Framework.Servers.HttpServer
                 // since its just for reporting, tickdiff limit can be adjusted
                 int tickdiff = Environment.TickCount - tickstart;
                 if (tickdiff > 3000)
+                {
                     m_log.InfoFormat(
-                        "[BASE HTTP SERVER]: slow {0} request for {1} from {2} took {3} ms", requestMethod, uriString, request.RemoteIPEndPoint.ToString(), tickdiff);
+                        "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} from {4} took {5}ms",
+                        requestMethod,
+                        uriString,
+                        requestHandler != null ? requestHandler.Name : "",
+                        requestHandler != null ? requestHandler.Description : "",
+                        request.RemoteIPEndPoint.ToString(),
+                        tickdiff);
+                }
             }
         }
 
@@ -925,11 +933,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                         catch (SocketException e)
                         {
                             // This has to be here to prevent a Linux/Mono crash
-                            m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                            m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                         }
                         catch (IOException e)
                         {
-                            m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                            m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                         }
                     }
                     return;
@@ -962,11 +970,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
                 catch (IOException e)
                 {
-                    m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                 }
             }
         }
@@ -1077,12 +1085,12 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 catch (IOException e)
                 {
-                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD IOException {0}.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD IOException {0} ", e.Message), e);
                 }
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
             }
         }
@@ -1334,8 +1342,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                     catch (SocketException f)
                     {
                         // This has to be here to prevent a Linux/Mono crash
-                        m_log.WarnFormat(
-                            "[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", f);
+                        m_log.Warn(
+                            String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", f.Message), f);
                     }
                 }
                 catch(Exception)
@@ -1653,11 +1661,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
                 catch (IOException e)
                 {
-                    m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                 }
             }
         }
@@ -1694,7 +1702,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
             }
         }
@@ -1730,7 +1738,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
             }
         }
@@ -1809,7 +1817,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public void httpServerException(object source, Exception exception)
         {
-            m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
+            m_log.Error(String.Format("[BASE HTTP SERVER]: {0} had an exception: {1} ", source.ToString(), exception.Message), exception);
            /*
             if (HTTPDRunning)// && NotSocketErrors > 5)
             {
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
index a2135a3..ae7aaf2 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
@@ -45,8 +45,16 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private readonly string m_path;
 
-        protected BaseRequestHandler(string httpMethod, string path)
+        public string Name { get; private set; }
+
+        public string Description { get; private set; }
+
+        protected BaseRequestHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
+
+        protected BaseRequestHandler(string httpMethod, string path, string name, string description)
         {
+            Name = name;
+            Description = description;
             m_httpMethod = httpMethod;
             m_path = path;
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
index f1cde74..6342983 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
@@ -34,8 +34,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         public abstract byte[] Handle(string path, Stream request,
                                       IOSHttpRequest httpRequest, IOSHttpResponse httpResponse);
 
-        protected BaseStreamHandler(string httpMethod, string path) : base(httpMethod, path)
-        {
-        }
+        protected BaseStreamHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
+
+        protected BaseStreamHandler(string httpMethod, string path, string name, string description)
+            : base(httpMethod, path, name, description) {}
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
index 1699233..b94bfb4 100644
--- a/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
@@ -36,6 +36,15 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         private BinaryMethod m_method;
 
+        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod)
+            : this(httpMethod, path, binaryMethod, null, null) {}
+
+        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod, string name, string description)
+            : base(httpMethod, path, name, description)
+        {
+            m_method = binaryMethod;
+        }
+
         public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             byte[] data = ReadFully(request);
@@ -45,12 +54,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             return Encoding.UTF8.GetBytes(responseString);
         }
 
-        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod)
-            : base(httpMethod, path)
-        {
-            m_method = binaryMethod;
-        }
-
         private static byte[] ReadFully(Stream stream)
         {
             byte[] buffer = new byte[1024];
@@ -70,4 +73,4 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
index a449c2d..cb5cce5 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
@@ -32,6 +32,25 @@ namespace OpenSim.Framework.Servers.HttpServer
 {
     public interface IRequestHandler
     {
+
+        /// <summary>
+        /// Name for this handler.
+        /// </summary>
+        /// <remarks>
+        /// Used for diagnostics.  The path doesn't always describe what the handler does.  Can be null if none
+        /// specified.
+        /// </remarks>
+        string Name { get; }
+
+        /// <summary>
+        /// Description for this handler.
+        /// </summary>
+        /// <remarks>
+        /// Used for diagnostics.  The path doesn't always describe what the handler does.  Can be null if none
+        /// specified.
+        /// </remarks>
+        string Description { get; }
+
         // Return response content type
         string ContentType { get; }
 
@@ -58,4 +77,4 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         Hashtable Handle(string path, Hashtable request);
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
index 5625227..a736c8b 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
@@ -28,143 +28,252 @@
 namespace OpenSim.Framework.Servers.HttpServer
 {
     /// <summary>
-    /// HTTP status codes (almost) as defined by W3C in
-    /// http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+    /// HTTP status codes (almost) as defined by W3C in http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html and IETF in http://tools.ietf.org/html/rfc6585
     /// </summary>
-    public enum OSHttpStatusCode: int
+    public enum OSHttpStatusCode : int
     {
-        // 1xx Informational status codes providing a provisional
-        // response.
-        // 100 Tells client that to keep on going sending its request
-        InfoContinue                          = 100,
-        // 101 Server understands request, proposes to switch to different
-        // application level protocol
-        InfoSwitchingProtocols                = 101,
-
-
-        // 2xx Success codes
-        // 200 Request successful
-        SuccessOk                             = 200,
-        // 201 Request successful, new resource created
-        SuccessOkCreated                      = 201,
-        // 202 Request accepted, processing still on-going
-        SuccessOkAccepted                     = 202,
-        // 203 Request successful, meta information not authoritative
-        SuccessOkNonAuthoritativeInformation  = 203,
-        // 204 Request successful, nothing to return in the body
-        SuccessOkNoContent                    = 204,
-        // 205 Request successful, reset displayed content
-        SuccessOkResetContent                 = 205,
-        // 206 Request successful, partial content returned
-        SuccessOkPartialContent               = 206,
-
-        // 3xx Redirect code: user agent needs to go somewhere else
-        // 300 Redirect: different presentation forms available, take
-        // a pick
-        RedirectMultipleChoices               = 300,
-        // 301 Redirect: requested resource has moved and now lives
-        // somewhere else
-        RedirectMovedPermanently              = 301,
-        // 302 Redirect: Resource temporarily somewhere else, location
-        // might change
-        RedirectFound                         = 302,
-        // 303 Redirect: See other as result of a POST
-        RedirectSeeOther                      = 303,
-        // 304 Redirect: Resource still the same as before
-        RedirectNotModified                   = 304,
-        // 305 Redirect: Resource must be accessed via proxy provided
-        // in location field
-        RedirectUseProxy                      = 305,
-        // 307 Redirect: Resource temporarily somewhere else, location
-        // might change
-        RedirectMovedTemporarily              = 307,
-
-        // 4xx Client error: the client borked the request
-        // 400 Client error: bad request, server does not grok what
-        // the client wants
-        ClientErrorBadRequest                 = 400,
-        // 401 Client error: the client is not authorized, response
-        // provides WWW-Authenticate header field with a challenge
-        ClientErrorUnauthorized               = 401,
-        // 402 Client error: Payment required (reserved for future use)
-        ClientErrorPaymentRequired            = 402,
-        // 403 Client error: Server understood request, will not
-        // deliver, do not try again.
-        ClientErrorForbidden                  = 403,
-        // 404 Client error: Server cannot find anything matching the
-        // client request.
-        ClientErrorNotFound                   = 404,
-        // 405 Client error: The method specified by the client in the
-        // request is not allowed for the resource requested
-        ClientErrorMethodNotAllowed           = 405,
-        // 406 Client error: Server cannot generate suitable response
-        // for the resource and content characteristics requested by
-        // the client
-        ClientErrorNotAcceptable              = 406,
-        // 407 Client error: Similar to 401, Server requests that
-        // client authenticate itself with the proxy first
-        ClientErrorProxyAuthRequired          = 407,
-        // 408 Client error: Server got impatient with client and
-        // decided to give up waiting for the client's request to
-        // arrive
-        ClientErrorRequestTimeout             = 408,
-        // 409 Client error: Server could not fulfill the request for
-        // a resource as there is a conflict with the current state of
-        // the resource but thinks client can do something about this
-        ClientErrorConflict                   = 409,
-        // 410 Client error: The resource has moved somewhere else,
-        // but server has no clue where.
-        ClientErrorGone                       = 410,
-        // 411 Client error: The server is picky again and insists on
-        // having a content-length header field in the request
-        ClientErrorLengthRequired             = 411,
-        // 412 Client error: one or more preconditions supplied in the
-        // client's request is false
-        ClientErrorPreconditionFailed         = 412,
-        // 413 Client error: For fear of reflux, the server refuses to
-        // swallow that much data.
-        ClientErrorRequestEntityToLarge       = 413,
-        // 414 Client error: The server considers the Request-URI to
-        // be indecently long and refuses to even look at it.
-        ClientErrorRequestURITooLong          = 414,
-        // 415 Client error: The server has no clue about the media
-        // type requested by the client (contrary to popular belief it
-        // is not a warez server)
-        ClientErrorUnsupportedMediaType       = 415,
-        // 416 Client error: The requested range cannot be delivered
-        // by the server.
+        #region 1xx Informational status codes providing a provisional response.
+
+        /// <summary>
+        /// 100 Tells client that to keep on going sending its request
+        /// </summary>
+        InfoContinue = 100,
+
+        /// <summary>
+        /// 101 Server understands request, proposes to switch to different application level protocol
+        /// </summary>
+        InfoSwitchingProtocols = 101,
+
+        #endregion
+
+        #region 2xx Success codes
+
+        /// <summary>
+        /// 200 Request successful
+        /// </summary>
+        SuccessOk = 200,
+
+        /// <summary>
+        /// 201 Request successful, new resource created
+        /// </summary>
+        SuccessOkCreated = 201,
+
+        /// <summary>
+        /// 202 Request accepted, processing still on-going
+        /// </summary>
+        SuccessOkAccepted = 202,
+
+        /// <summary>
+        /// 203 Request successful, meta information not authoritative
+        /// </summary>
+        SuccessOkNonAuthoritativeInformation = 203,
+
+        /// <summary>
+        /// 204 Request successful, nothing to return in the body
+        /// </summary>
+        SuccessOkNoContent = 204,
+
+        /// <summary>
+        /// 205 Request successful, reset displayed content
+        /// </summary>
+        SuccessOkResetContent = 205,
+
+        /// <summary>
+        /// 206 Request successful, partial content returned
+        /// </summary>
+        SuccessOkPartialContent = 206,
+
+        #endregion
+
+        #region 3xx Redirect code: user agent needs to go somewhere else
+
+        /// <summary>
+        /// 300 Redirect: different presentation forms available, take a pick
+        /// </summary>
+        RedirectMultipleChoices = 300,
+        
+        /// <summary>
+        /// 301 Redirect: requested resource has moved and now lives somewhere else
+        /// </summary>
+        RedirectMovedPermanently = 301,
+
+        /// <summary>
+        /// 302 Redirect: Resource temporarily somewhere else, location might change
+        /// </summary>
+        RedirectFound = 302,
+
+        /// <summary>
+        /// 303 Redirect: See other as result of a POST
+        /// </summary>
+        RedirectSeeOther = 303,
+
+        /// <summary>
+        /// 304 Redirect: Resource still the same as before
+        /// </summary>
+        RedirectNotModified = 304,
+
+        /// <summary>
+        /// 305 Redirect: Resource must be accessed via proxy provided in location field
+        /// </summary>
+        RedirectUseProxy = 305,
+
+        /// <summary>
+        /// 307 Redirect: Resource temporarily somewhere else, location might change
+        /// </summary>
+        RedirectMovedTemporarily = 307,
+
+        #endregion
+
+        #region 4xx Client error: the client borked the request
+
+        /// <summary>
+        /// 400 Client error: bad request, server does not grok what the client wants
+        /// </summary>
+        ClientErrorBadRequest = 400,
+
+        /// <summary>
+        /// 401 Client error: the client is not authorized, response provides WWW-Authenticate header field with a challenge
+        /// </summary>
+        ClientErrorUnauthorized = 401,
+
+        /// <summary>
+        /// 402 Client error: Payment required (reserved for future use)
+        /// </summary>
+        ClientErrorPaymentRequired = 402,
+
+        /// <summary>
+        /// 403 Client error: Server understood request, will not deliver, do not try again.
+        ClientErrorForbidden = 403,
+
+        /// <summary>
+        /// 404 Client error: Server cannot find anything matching the client request.
+        /// </summary>
+        ClientErrorNotFound = 404,
+
+        /// <summary>
+        /// 405 Client error: The method specified by the client in the request is not allowed for the resource requested
+        /// </summary>
+        ClientErrorMethodNotAllowed = 405,
+
+        /// <summary>
+        /// 406 Client error: Server cannot generate suitable response for the resource and content characteristics requested by the client
+        /// </summary>
+        ClientErrorNotAcceptable = 406,
+
+        /// <summary>
+        /// 407 Client error: Similar to 401, Server requests that client authenticate itself with the proxy first
+        /// </summary>
+        ClientErrorProxyAuthRequired = 407,
+
+        /// <summary>
+        /// 408 Client error: Server got impatient with client and decided to give up waiting for the client's request to arrive
+        /// </summary>
+        ClientErrorRequestTimeout = 408,
+
+        /// <summary>
+        /// 409 Client error: Server could not fulfill the request for a resource as there is a conflict with the current state of the resource but thinks client can do something about this
+        /// </summary>
+        ClientErrorConflict = 409,
+
+        /// <summary>
+        /// 410 Client error: The resource has moved somewhere else, but server has no clue where.
+        /// </summary>
+        ClientErrorGone = 410,
+
+        /// <summary>
+        /// 411 Client error: The server is picky again and insists on having a content-length header field in the request
+        /// </summary>
+        ClientErrorLengthRequired = 411,
+
+        /// <summary>
+        /// 412 Client error: one or more preconditions supplied in the client's request is false
+        /// </summary>
+        ClientErrorPreconditionFailed = 412,
+
+        /// <summary>
+        /// 413 Client error: For fear of reflux, the server refuses to swallow that much data.
+        /// </summary>
+        ClientErrorRequestEntityToLarge = 413,
+
+        /// <summary>
+        /// 414 Client error: The server considers the Request-URI to be indecently long and refuses to even look at it.
+        /// </summary>
+        ClientErrorRequestURITooLong = 414,
+
+        /// <summary>
+        /// 415 Client error: The server has no clue about the media type requested by the client (contrary to popular belief it is not a warez server)
+        /// </summary>
+        ClientErrorUnsupportedMediaType = 415,
+
+        /// <summary>
+        /// 416 Client error: The requested range cannot be delivered by the server.
+        /// </summary>
         ClientErrorRequestRangeNotSatisfiable = 416,
-        // 417 Client error: The expectations of the client as
-        // expressed in one or more Expect header fields cannot be met
-        // by the server, the server is awfully sorry about this.
-        ClientErrorExpectationFailed          = 417,
-        // 499 Client error: Wildcard error.
-        ClientErrorJoker                      = 499,
-
-        // 5xx Server errors (rare)
-        // 500 Server error: something really strange and unexpected
-        // happened
-        ServerErrorInternalError              = 500,
-        // 501 Server error: The server does not do the functionality
-        // required to carry out the client request. not at
-        // all. certainly not before breakfast. but also not after
-        // breakfast.
-        ServerErrorNotImplemented             = 501,
-        // 502 Server error: While acting as a proxy or a gateway, the
-        // server got ditched by the upstream server and as a
-        // consequence regretfully cannot fulfill the client's request
-        ServerErrorBadGateway                 = 502,
-        // 503 Server error: Due to unforseen circumstances the server
-        // cannot currently deliver the service requested. Retry-After
-        // header might indicate when to try again.
-        ServerErrorServiceUnavailable         = 503,
-        // 504 Server error: The server blames the upstream server
-        // for not being able to deliver the service requested and
-        // claims that the upstream server is too slow delivering the
-        // goods.
-        ServerErrorGatewayTimeout             = 504,
-        // 505 Server error: The server does not support the HTTP
-        // version conveyed in the client's request.
-        ServerErrorHttpVersionNotSupported    = 505,
+
+        /// <summary>
+        /// 417 Client error: The expectations of the client as expressed in one or more Expect header fields cannot be met by the server, the server is awfully sorry about this.
+        /// </summary>
+        ClientErrorExpectationFailed = 417,
+
+        /// <summary>
+        /// 428 Client error :The 428 status code indicates that the origin server requires the request to be conditional.
+        /// </summary>
+        ClientErrorPreconditionRequired = 428,
+
+        /// <summary>
+        /// 429 Client error: The 429 status code indicates that the user has sent too many requests in a given amount of time ("rate limiting").
+        /// </summary>
+        ClientErrorTooManyRequests = 429,
+
+        /// <summary>
+        /// 431 Client error: The 431 status code indicates that the server is unwilling to process the request because its header fields are too large.  The request MAY be resubmitted after reducing the size of the request header fields.
+        /// </summary>
+        ClientErrorRequestHeaderFieldsTooLarge = 431,
+
+        /// <summary>
+        /// 499 Client error: Wildcard error.
+        /// </summary>
+        ClientErrorJoker = 499,
+
+        #endregion
+
+        #region 5xx Server errors (rare)
+
+        /// <summary>
+        /// 500 Server error: something really strange and unexpected happened
+        /// </summary>
+        ServerErrorInternalError = 500,
+
+        /// <summary>
+        /// 501 Server error: The server does not do the functionality required to carry out the client request. not at all. certainly not before breakfast. but also not after breakfast.
+        /// </summary>
+        ServerErrorNotImplemented = 501,
+
+        /// <summary>
+        /// 502 Server error: While acting as a proxy or a gateway, the server got ditched by the upstream server and as a consequence regretfully cannot fulfill the client's request
+        /// </summary>
+        ServerErrorBadGateway = 502,
+
+        /// <summary>
+        /// 503 Server error: Due to unforseen circumstances the server cannot currently deliver the service requested. Retry-After header might indicate when to try again.
+        /// </summary>
+        ServerErrorServiceUnavailable = 503,
+
+        /// <summary>
+        /// 504 Server error: The server blames the upstream server for not being able to deliver the service requested and claims that the upstream server is too slow delivering the goods.
+        /// </summary>
+        ServerErrorGatewayTimeout = 504,
+
+        /// <summary>
+        /// 505 Server error: The server does not support the HTTP version conveyed in the client's request.
+        /// </summary>
+        ServerErrorHttpVersionNotSupported = 505,
+
+        /// <summary>
+        /// 511 Server error: The 511 status code indicates that the client needs to authenticate to gain network access.
+        /// </summary>
+        ServerErrorNetworkAuthenticationRequired = 511,
+
+        #endregion
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
index a467a83..07082a8 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
@@ -39,7 +39,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         private RestDeserialiseMethod<TRequest, TResponse> m_method;
 
         public RestDeserialiseHandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method)
-            : base(httpMethod, path)
+            : this(httpMethod, path, method, null, null) {}
+
+        public RestDeserialiseHandler(
+            string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method, string name, string description)
+            : base(httpMethod, path, name, description)
         {
             m_method = method;
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/RestHTTPHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestHTTPHandler.cs
index 1f23cac..7f89839 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestHTTPHandler.cs
@@ -38,19 +38,25 @@ namespace OpenSim.Framework.Servers.HttpServer
             get { return m_dhttpMethod; }
         }
 
-        public override Hashtable Handle(string path, Hashtable request)
+        public RestHTTPHandler(string httpMethod, string path, GenericHTTPMethod dhttpMethod)
+            : base(httpMethod, path)
         {
+            m_dhttpMethod = dhttpMethod;
+        }
+
+        public RestHTTPHandler(
+            string httpMethod, string path, GenericHTTPMethod dhttpMethod, string name, string description)
+            : base(httpMethod, path, name, description)
+        {
+            m_dhttpMethod = dhttpMethod;
+        }
 
+        public override Hashtable Handle(string path, Hashtable request)
+        {
             string param = GetParam(path);
             request.Add("param", param);
             request.Add("path", path);
             return m_dhttpMethod(request);
         }
-
-        public RestHTTPHandler(string httpMethod, string path, GenericHTTPMethod dhttpMethod)
-            : base(httpMethod, path)
-        {
-            m_dhttpMethod = dhttpMethod;
-        }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
index d2c4002..1f17fee 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
@@ -39,6 +39,15 @@ namespace OpenSim.Framework.Servers.HttpServer
             get { return m_restMethod; }
         }
 
+        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod)
+            : this(httpMethod, path, restMethod, null, null) {}
+
+        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod, string name, string description)
+            : base(httpMethod, path, name, description)
+        {
+            m_restMethod = restMethod;
+        }
+
         public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             Encoding encoding = Encoding.UTF8;
@@ -52,10 +61,5 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             return Encoding.UTF8.GetBytes(responseString);
         }
-
-        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod) : base(httpMethod, path)
-        {
-            m_restMethod = restMethod;
-        }
     }
 }