Merged

1 files changed, 59 insertions, 62 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index d20f8c9..452df38 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private HttpServerLogWriter httpserverlog = new HttpServerLogWriter();
-        
+
         private volatile int NotSocketErrors = 0;
         public volatile bool HTTPDRunning = false;
 
@@ -160,7 +160,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 m_rpcHandlers[method] = handler;
                 m_rpcHandlersKeepAlive[method] = keepAlive; // default
             }
-            
+
             return true;
         }
 
@@ -182,7 +182,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         public bool AddHTTPHandler(string methodName, GenericHTTPMethod handler)
         {
             //m_log.DebugFormat("[BASE HTTP SERVER]: Registering {0}", methodName);
-            
+
             lock (m_HTTPHandlers)
             {
                 if (!m_HTTPHandlers.ContainsKey(methodName))
@@ -204,14 +204,14 @@ namespace OpenSim.Framework.Servers.HttpServer
                 if (!m_pollHandlers.ContainsKey(methodName))
                 {
                     m_pollHandlers.Add(methodName,args);
-                    pollHandlerResult = true;                    
+                    pollHandlerResult = true;
                 }
             }
-            
+
             if (pollHandlerResult)
                 return AddHTTPHandler(methodName, handler);
 
-            return false;            
+            return false;
         }
 
         // Note that the agent string is provided simply to differentiate
@@ -257,51 +257,51 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 IHttpClientContext context = (IHttpClientContext)source;
                 IHttpRequest request = args.Request;
-                
+
                 PollServiceEventArgs psEvArgs;
-    
+
                 if (TryGetPollServiceHTTPHandler(request.UriPath.ToString(), out psEvArgs))
                 {
                     PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request);
-    
+
                     if (psEvArgs.Request != null)
                     {
                         OSHttpRequest req = new OSHttpRequest(context, request);
-                        
+
                         Stream requestStream = req.InputStream;
-    
+
                         Encoding encoding = Encoding.UTF8;
                         StreamReader reader = new StreamReader(requestStream, encoding);
-    
+
                         string requestBody = reader.ReadToEnd();
-    
+
                         Hashtable keysvals = new Hashtable();
                         Hashtable headervals = new Hashtable();
-    
+
                         string[] querystringkeys = req.QueryString.AllKeys;
                         string[] rHeaders = req.Headers.AllKeys;
-    
+
                         keysvals.Add("body", requestBody);
                         keysvals.Add("uri", req.RawUrl);
                         keysvals.Add("content-type", req.ContentType);
                         keysvals.Add("http-method", req.HttpMethod);
-    
+
                         foreach (string queryname in querystringkeys)
                         {
                             keysvals.Add(queryname, req.QueryString[queryname]);
                         }
-    
+
                         foreach (string headername in rHeaders)
                         {
                             headervals[headername] = req.Headers[headername];
                         }
-    
+
                         keysvals.Add("headers", headervals);
                         keysvals.Add("querystringkeys", querystringkeys);
-    
+
                         psEvArgs.Request(psreq.RequestID, keysvals);
                     }
-    
+
                     m_PollServiceManager.Enqueue(psreq);
                 }
                 else
@@ -348,10 +348,10 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             try
             {
-//                m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl);                
-                
+//                m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl);
+
                 Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true);
-                
+
                 //  This is the REST agent interface. We require an agent to properly identify
                 //  itself. If the REST handler recognizes the prefix it will attempt to
                 //  satisfy the request. If it is not recognizable, and no damage has occurred
@@ -456,7 +456,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     }
 
                     request.InputStream.Close();
-                    
+
                     // HTTP IN support. The script engine taes it from here
                     // Nothing to worry about for us.
                     //
@@ -540,7 +540,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             HandleLLSDRequests(request, response);
                             return;
                         }
-                    
+
 //                        m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
                         if (DoWeHaveAHTTPHandler(request.RawUrl))
                         {
@@ -594,7 +594,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         }
                     }
                 }
-                
+
                 if (String.IsNullOrEmpty(bestMatch))
                 {
                     streamHandler = null;
@@ -641,7 +641,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         private bool TryGetHTTPHandler(string handlerKey, out GenericHTTPMethod HTTPHandler)
         {
 //            m_log.DebugFormat("[BASE HTTP HANDLER]: Looking for HTTP handler for {0}", handlerKey);
-            
+
             string bestMatch = null;
 
             lock (m_HTTPHandlers)
@@ -727,14 +727,14 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     xmlRprcRequest.Params.Add(request.RemoteIPEndPoint); // Param[1]
                     XmlRpcResponse xmlRpcResponse;
-                    
+
                     XmlRpcMethod method;
                     bool methodWasFound;
                     lock (m_rpcHandlers)
                     {
                         methodWasFound = m_rpcHandlers.TryGetValue(methodName, out method);
                     }
-                    
+
                     if (methodWasFound)
                     {
                         xmlRprcRequest.Params.Add(request.Url); // Param[2]
@@ -766,10 +766,10 @@ namespace OpenSim.Framework.Servers.HttpServer
                     else
                     {
                         xmlRpcResponse = new XmlRpcResponse();
-                        
+
                         // Code set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
                         xmlRpcResponse.SetFault(
-                            XmlRpcErrorCodes.SERVER_ERROR_METHOD, 
+                            XmlRpcErrorCodes.SERVER_ERROR_METHOD,
                             String.Format("Requested method [{0}] not found", methodName));
                     }
 
@@ -786,11 +786,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                     response.KeepAlive = false;
 
                     m_log.ErrorFormat("[BASE HTTP SERVER]: Handler not found for http request {0}", request.RawUrl);
-                    
+
                     response.SendChunked = false;
                     response.ContentLength64 = buf.Length;
                     response.ContentEncoding = Encoding.UTF8;
-                    
+
                     try
                     {
                         response.OutputStream.Write(buf, 0, buf.Length);
@@ -872,13 +872,13 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             OSD llsdRequest = null;
             OSD llsdResponse = null;
-            
+
             bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest"));
-            
+
             if (requestBody.Length == 0)
             // Get Request
             {
-                requestBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><llsd><map><key>request</key><string>get</string></map></llsd>"; 
+                requestBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><llsd><map><key>request</key><string>get</string></map></llsd>";
             }
             try
             {
@@ -1090,7 +1090,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             string bestMatch = null;
 
             //m_log.DebugFormat("[BASE HTTP HANDLER]: Checking if we have an HTTP handler for {0}", searchquery);
-            
+
             lock (m_HTTPHandlers)
             {
                 foreach (string pattern in m_HTTPHandlers.Keys)
@@ -1156,7 +1156,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         // You have to specifically register for '/' and to get it, you must specificaly request it
                         //
                         if (pattern == "/" && searchquery == "/" || pattern != "/")
-                            bestMatch = pattern; 
+                            bestMatch = pattern;
                     }
                 }
             }
@@ -1236,11 +1236,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
 
         public void HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
-        {            
+        {
 //            m_log.DebugFormat(
-//                "[BASE HTTP SERVER]: HandleHTTPRequest for request to {0}, method {1}", 
+//                "[BASE HTTP SERVER]: HandleHTTPRequest for request to {0}, method {1}",
 //                request.RawUrl, request.HttpMethod);
-            
+
             switch (request.HttpMethod)
             {
                 case "OPTIONS":
@@ -1256,7 +1256,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         private void HandleContentVerbs(OSHttpRequest request, OSHttpResponse response)
         {
 //            m_log.DebugFormat("[BASE HTTP SERVER]: HandleContentVerbs for request to {0}", request.RawUrl);
-            
+
             // This is a test.  There's a workable alternative..  as this way sucks.
             // We'd like to put this into a text file parhaps that's easily editable.
             //
@@ -1391,7 +1391,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
 //            m_log.DebugFormat(
 //                "[BASE HTTP HANDLER]: TryGetHTTPHandlerPathBased() looking for HTTP handler to match {0}", searchquery);
-            
+
             lock (m_HTTPHandlers)
             {
                 foreach (string pattern in m_HTTPHandlers.Keys)
@@ -1452,7 +1452,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             //Even though only one other part of the entire code uses HTTPHandlers, we shouldn't expect this
             //and should check for NullReferenceExceptions
-            
+
             if (string.IsNullOrEmpty(contentType))
             {
                 contentType = "text/html";
@@ -1472,8 +1472,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             byte[] buffer;
 
-            if (!(contentType.Contains("image") 
-                || contentType.Contains("x-shockwave-flash") 
+            if (!(contentType.Contains("image")
+                || contentType.Contains("x-shockwave-flash")
                 || contentType.Contains("application/x-oar")))
             {
                 // Text
@@ -1504,7 +1504,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     response.OutputStream.Flush();
                     response.Send();
-                    
+
                     //if (!response.KeepAlive && response.ReuseContext)
                     //    response.FreeContext();
                 }
@@ -1611,11 +1611,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                     m_httpListener2 = CoolHTTPListener.Create(m_listenIPAddress, (int)m_port);
                     m_httpListener2.ExceptionThrown += httpServerException;
                     m_httpListener2.LogWriter = httpserverlog;
-                    
-                    // Uncomment this line in addition to those in HttpServerLogWriter 
+
+                    // Uncomment this line in addition to those in HttpServerLogWriter
                     // if you want more detailed trace information from the HttpServer
                     //m_httpListener2.UseTraceLogs = true;
-                    
+
                     //m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor;
                 }
                 else
@@ -1643,8 +1643,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 m_log.Error("[BASE HTTP SERVER]: Error - " + e.Message);
                 m_log.Error("[BASE HTTP SERVER]: Tip: Do you have permission to listen on port " + m_port + ", " + m_sslport + "?");
-                
-                // We want this exception to halt the entire server since in current configurations we aren't too 
+
+                // We want this exception to halt the entire server since in current configurations we aren't too
                 // useful without inbound HTTP.
                 throw e;
             }
@@ -1656,7 +1656,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 case SocketError.NotSocket:
                     NotSocketErrors++;
-                    
+
                     break;
             }
         }
@@ -1686,12 +1686,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 m_httpListener2.LogWriter = null;
                 m_httpListener2.RequestReceived -= OnRequest;
                 m_httpListener2.Stop();
-            } 
+            }
             catch (NullReferenceException)
             {
                 m_log.Warn("[BASE HTTP SERVER]: Null Reference when stopping HttpServer.");
             }
-            
         }
 
         public void RemoveStreamHandler(string httpMethod, string path)
@@ -1712,7 +1711,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     m_HTTPHandlers.Remove(path);
                     return;
                 }
-                
+
                 m_HTTPHandlers.Remove(GetHandlerKey(httpMethod, path));
             }
         }
@@ -1728,7 +1727,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
 
             RemoveHTTPHandler(httpMethod, path);
-            
         }
 
         public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler)
@@ -1759,7 +1757,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
-        
         public bool RemoveLLSDHandler(string path, LLSDMethod handler)
         {
             try
@@ -1833,7 +1830,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             oresp = osresp;
         }
     }
-    
+
     /// <summary>
     /// Relays HttpServer log messages to our own logging mechanism.
     /// </summary>
@@ -1852,7 +1849,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 case LogPrio.Trace:
                     m_log.DebugFormat("[{0}]: {1}", source, message);
-                    break;                
+                    break;
                 case LogPrio.Debug:
                     m_log.DebugFormat("[{0}]: {1}", source, message);
                     break;
@@ -1872,8 +1869,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                     break;
             }
             */
-            
+
             return;
         }
     }
-}
\ No newline at end of file
+}