remove excess garbage

OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs

@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -62,13 +63,21 @@ namespace OpenSim.Capabilities.Handlers
         }
 
         public string FetchInventoryDescendentsRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            using (MemoryStream ms = new MemoryStream(Utils.StringToBytes(request), false))
+            {
+                return FetchInventoryDescendentsRequest(ms, path, param, httpRequest, httpResponse);
+            }
+        }
+
+        public string FetchInventoryDescendentsRequest(Stream request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             //m_log.DebugFormat("[XXX]: FetchInventoryDescendentsRequest in {0}, {1}", (m_Scene == null) ? "none" : m_Scene.Name, request);
 
             ArrayList foldersrequested = null;
             try
             {
-                Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
+                Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(request);
                 foldersrequested = (ArrayList)hash["folders"];
                 hash = null;
             }

OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs

@@ -79,7 +79,7 @@ namespace OpenSim.Capabilities.Handlers
             m_assetService = assService;
         }
 
-        public Hashtable Handle(Hashtable request)
+        public Hashtable Handle(OSHttpRequest req)
         {
             Hashtable responsedata = new Hashtable();
             responsedata["content_type"] = "text/plain";
@@ -95,25 +95,27 @@ namespace OpenSim.Capabilities.Handlers
 
             responsedata["int_response_code"] = (int)System.Net.HttpStatusCode.BadRequest;
 
-            string[] queries = null;
+            var queries = req.Query;
-            if(request.Contains("querystringkeys"))
+            if(queries.Count == 0)
-                queries = (string[])request["querystringkeys"];
-            
-            if(queries == null || queries.Length == 0)
                 return responsedata;
 
-            string query = queries[0];
+            AssetType type = AssetType.Unknown;
-            if(!queryTypes.ContainsKey(query))
+            string assetStr = string.Empty;
+            foreach (KeyValuePair<string,string> kvp in queries)
             {
-                m_log.Warn("[GETASSET]: Unknown type: " + query);
+                if (queryTypes.ContainsKey(kvp.Key))
-                return responsedata;
+                {
+                    type = queryTypes[kvp.Key];
+                    assetStr = kvp.Value;
+                }
             }
 
-            AssetType type = queryTypes[query];
+            if(type == AssetType.Unknown)
-
+            {
-            string assetStr = string.Empty;
+                //m_log.Warn("[GETASSET]: Unknown type: " + query);
-            if (request.ContainsKey(query))
+                m_log.Warn("[GETASSET]: Unknown type");
-                assetStr = request[query].ToString();
+                return responsedata;
+            }
 
             if (String.IsNullOrEmpty(assetStr))
                 return responsedata;
@@ -139,11 +141,11 @@ namespace OpenSim.Capabilities.Handlers
 
             int len = asset.Data.Length;
 
-            string range = String.Empty;
+            string range = null;
-            if (((Hashtable)request["headers"])["range"] != null)
+            if (req.Headers["Range"] != null)
-               range = (string)((Hashtable)request["headers"])["range"];
+                range = req.Headers["Range"];
-            else if (((Hashtable)request["headers"])["Range"] != null)
+            else if (req.Headers["range"] != null)
-                range = (string)((Hashtable)request["headers"])["Range"];
+                range = req.Headers["range"];
 
             // range request
             int start, end;

OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs

@@ -533,49 +533,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 IHttpClientContext context = (IHttpClientContext)source;
                 IHttpRequest request = args.Request;
 
-                PollServiceEventArgs psEvArgs;
+                if (TryGetPollServiceHTTPHandler(request.UriPath.ToString(), out PollServiceEventArgs psEvArgs))
-
-                if (TryGetPollServiceHTTPHandler(request.UriPath.ToString(), out psEvArgs))
                 {
                     psEvArgs.RequestsReceived++;
-
                     PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request);
-
+                    psEvArgs.Request?.Invoke(psreq.RequestID, new OSHttpRequest(context, request));
-                    if (psEvArgs.Request != null)
-                    {
-                        OSHttpRequest req = new OSHttpRequest(context, request);
-                        string requestBody;
-                        Encoding encoding = Encoding.UTF8;
-                        using(StreamReader reader = new StreamReader(req.InputStream, encoding))
-                            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
@@ -1128,7 +1090,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             String requestBody;
 
-            Stream requestStream = Util.Copy(request.InputStream);
+            Stream requestStream = request.InputStream;
             Stream innerStream = null;
             try
             {
@@ -1141,7 +1103,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
                     requestBody = reader.ReadToEnd();
 
-                }
+            }
             finally
             {
                 if (innerStream != null && innerStream.CanRead)
@@ -1402,12 +1364,8 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             //m_log.Warn("[BASE HTTP SERVER]: We've figured out it's a LLSD Request");
             bool notfound = false;
-
-            Stream requestStream = request.InputStream;
-
             string requestBody;
-            Encoding encoding = Encoding.UTF8;
+            using(StreamReader reader = new StreamReader(request.InputStream, Encoding.UTF8))
-            using(StreamReader reader = new StreamReader(requestStream, encoding))
                 requestBody= reader.ReadToEnd();
 
             //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
@@ -1433,9 +1391,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             if (llsdRequest != null)// && m_defaultLlsdHandler != null)
             {
-                LLSDMethod llsdhandler = null;
+                if (!LegacyLLSDLoginLibOMV && TryGetLLSDHandler(request.RawUrl, out LLSDMethod llsdhandler))
-
-                if (TryGetLLSDHandler(request.RawUrl, out llsdhandler) && !LegacyLLSDLoginLibOMV)
                 {
                     // we found a registered llsd handler to service this request
                     llsdResponse = llsdhandler(request.RawUrl, llsdRequest, request.RemoteIPEndPoint.ToString());
@@ -1447,7 +1403,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                     if (m_defaultLlsdHandler != null)
                     {
-                        // LibOMV path
                         llsdResponse = m_defaultLlsdHandler(llsdRequest, request.RemoteIPEndPoint);
                     }
                     else
@@ -1729,10 +1684,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             byte[] buffer;
 
-            Stream requestStream = request.InputStream;
             string requestBody;
-            Encoding encoding = Encoding.UTF8;
+            using(StreamReader reader = new StreamReader(request.InputStream, Encoding.UTF8))
-            using(StreamReader reader = new StreamReader(requestStream, encoding))
                 requestBody = reader.ReadToEnd();
 
             Hashtable keysvals = new Hashtable();

OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpRequest.cs

@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
 using System.Net;
@@ -50,7 +51,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         bool IsSecured { get; }
         bool KeepAlive { get; }
         NameValueCollection QueryString { get; }
-        Hashtable Query { get; }
+        Dictionary<string, string> Query { get; }
         string RawUrl { get; }
         IPEndPoint RemoteIPEndPoint { get; }
         Uri Url { get; }

OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs

@@ -124,11 +124,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
         private NameValueCollection _queryString;
 
-        public Hashtable Query
+        public Dictionary<string,string> Query
         {
             get { return _query; }
         }
-        private Hashtable _query;
+        private Dictionary<string, string> _query;
 
         /// <value>
         /// POST request values, if applicable
@@ -225,7 +225,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
 
             _queryString = new NameValueCollection();
-            _query = new Hashtable();
+            _query = new Dictionary<string, string>();
             try
             {
                 foreach (HttpInputItem item in req.QueryString)

OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs

@@ -29,7 +29,6 @@ namespace OSHttpServer
         private int m_ReceiveBytesLeft;
         private ILogWriter _log;
         private readonly IHttpRequestParser m_parser;
-        private readonly int m_bufferSize;
         private HashSet<uint> requestsInServiceIDs;
         private Socket m_sock;
 
@@ -119,8 +118,7 @@ namespace OSHttpServer
             m_stream = stream;
             m_sock = sock;
 
-            m_bufferSize = 8196;
+            m_ReceiveBuffer = new byte[16384];
-            m_ReceiveBuffer = new byte[m_bufferSize];
             requestsInServiceIDs = new HashSet<uint>();
 
             SSLCommonName = "";
@@ -218,6 +216,8 @@ namespace OSHttpServer
             if (StreamPassedOff)
                 return;
 
+            contextID = -100;
+
             if (m_stream != null)
             {
                 m_stream.Close();
@@ -230,6 +230,7 @@ namespace OSHttpServer
             m_currentResponse?.Clear();
             m_currentResponse = null;
             requestsInServiceIDs.Clear();
+            m_parser.Clear();
 
             FirstRequestLineReceived = false;
             FullRequestReceived = false;
@@ -239,11 +240,7 @@ namespace OSHttpServer
             TriggerKeepalive = false;
 
             isSendingResponse = false;
-
             m_ReceiveBytesLeft = 0;
-
-            contextID = -100;
-            m_parser.Clear();
         }
 
         public void Close()
@@ -317,7 +314,7 @@ namespace OSHttpServer
                     if (m_stream != null)
                     {
                         if (error == SocketError.Success)
-                            m_stream.Flush();
+                            m_stream.Flush(); // we should be on a work task
                         m_stream.Close();
                         m_stream = null;
                     }
@@ -333,114 +330,6 @@ namespace OSHttpServer
             }
         }
 
-        private void OnReceive(IAsyncResult ar)
-        {
-            try
-            {
-                int bytesRead = 0;
-                if (m_stream == null)
-                    return;
-                try
-                {
-                    bytesRead = m_stream.EndRead(ar);
-                }
-                catch (NullReferenceException)
-                {
-                    Disconnect(SocketError.ConnectionReset);
-                    return;
-                }
-
-                if (bytesRead == 0)
-                {
-                    Disconnect(SocketError.ConnectionReset);
-                    return;
-                }
-
-                if(m_maxRequests <= 0)
-                    return;
-
-                m_ReceiveBytesLeft += bytesRead;
-                if (m_ReceiveBytesLeft > m_ReceiveBuffer.Length)
-                {
-                    throw new BadRequestException("HTTP header Too large: " + m_ReceiveBytesLeft);
-                }
-
-                int offset = m_parser.Parse(m_ReceiveBuffer, 0, m_ReceiveBytesLeft);
-                if (m_stream == null)
-                    return; // "Connection: Close" in effect.
-
-                // try again to see if we can parse another message (check parser to see if it is looking for a new message)
-                int nextOffset;
-                int nextBytesleft = m_ReceiveBytesLeft - offset;
-
-                while (offset != 0 && nextBytesleft > 0)
-                {
-                    nextOffset = m_parser.Parse(m_ReceiveBuffer, offset, nextBytesleft);
-
-                    if (m_stream == null)
-                        return; // "Connection: Close" in effect.
-
-                    if (nextOffset == 0)
-                        break;
-
-                    offset = nextOffset;
-                    nextBytesleft = m_ReceiveBytesLeft - offset;
-                }
-
-                // copy unused bytes to the beginning of the array
-                if (offset > 0 && m_ReceiveBytesLeft > offset)
-                    Buffer.BlockCopy(m_ReceiveBuffer, offset, m_ReceiveBuffer, 0, m_ReceiveBytesLeft - offset);
-
-                m_ReceiveBytesLeft -= offset;
-                if (m_stream != null && m_stream.CanRead)
-                {
-                    if (!StreamPassedOff)
-                        Stream.BeginRead(m_ReceiveBuffer, m_ReceiveBytesLeft, m_ReceiveBuffer.Length - m_ReceiveBytesLeft, OnReceive, null);
-                    else
-                    {
-                        _log.Write(this, LogPrio.Warning, "Could not read any more from the socket.");
-                        Disconnect(SocketError.Success);
-                    }
-                }
-            }
-            catch (BadRequestException err)
-            {
-                LogWriter.Write(this, LogPrio.Warning, "Bad request, responding with it. Error: " + err);
-                try
-                {
-                    Respond("HTTP/1.0", HttpStatusCode.BadRequest, err.Message);
-                }
-                catch (Exception err2)
-                {
-                    LogWriter.Write(this, LogPrio.Fatal, "Failed to reply to a bad request. " + err2);
-                }
-                Disconnect(SocketError.NoRecovery);
-            }
-            catch (IOException err)
-            {
-                LogWriter.Write(this, LogPrio.Debug, "Failed to end receive: " + err.Message);
-                if (err.InnerException is SocketException)
-                    Disconnect((SocketError)((SocketException)err.InnerException).ErrorCode);
-                else
-                    Disconnect(SocketError.ConnectionReset);
-            }
-            catch (ObjectDisposedException err)
-            {
-                LogWriter.Write(this, LogPrio.Debug, "Failed to end receive : " + err.Message);
-                Disconnect(SocketError.NotSocket);
-            }
-            catch (NullReferenceException err)
-            {
-                LogWriter.Write(this, LogPrio.Debug, "Failed to end receive : NullRef: " + err.Message);
-                Disconnect(SocketError.NoRecovery);
-            }
-            catch (Exception err)
-            {
-                LogWriter.Write(this, LogPrio.Debug, "Failed to end receive: " + err.Message);
-                Disconnect(SocketError.NoRecovery);
-            }
-        }
-
         private async void ReceiveLoop()
         {
             m_ReceiveBytesLeft = 0;

OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs

@@ -1,279 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace OpenSim.Framework.Servers.HttpServer
-{
-    /// <summary>
-    /// 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
-    {
-        #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,
-
-        /// <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
-    }
-}

OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs

@@ -31,7 +31,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
-    public delegate void RequestMethod(UUID requestID, Hashtable request);
+    public delegate void RequestMethod(UUID ID, OSHttpRequest request);
     public delegate bool HasEventsMethod(UUID requestID, UUID pId);
 
     public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId);

OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs

@@ -65,7 +65,8 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             public PollServiceAssetEventArgs thepoll;
             public UUID reqID;
-            public Hashtable request;
+            //public Hashtable request;
+            public OSHttpRequest request;
         }
 
         public class APollResponse
@@ -228,7 +229,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private class PollServiceAssetEventArgs : PollServiceEventArgs
         {
-            private List<Hashtable> requests = new List<Hashtable>();
+            //private List<Hashtable> requests = new List<Hashtable>();
+            private List<OSHttpRequest> requests = new List<OSHttpRequest>();
             private Dictionary<UUID, APollResponse> responses =new Dictionary<UUID, APollResponse>();
             private HashSet<UUID> dropedResponses = new HashSet<UUID>();
 

OpenSim/Region/ClientStack/Linden/Caps/ServerReleaseNotesModule.cs

@@ -30,6 +30,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Net;
 using System.Reflection;
 using log4net;
 using Mono.Addins;
@@ -124,7 +125,7 @@ namespace OpenSim.Region.ClientStack.LindenCaps
         private Hashtable ProcessServerReleaseNotes(Hashtable request, UUID agentID)
         {
             Hashtable responsedata = new Hashtable();
-            responsedata["int_response_code"] = 301;
+            responsedata["int_response_code"] = HttpStatusCode.Moved;
             responsedata["str_redirect_location"] = m_ServerReleaseNotesURL;
             return responsedata;
         }

OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs

@@ -29,7 +29,9 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
+using System.IO;
 using System.Reflection;
+using System.Text;
 using System.Threading;
 using log4net;
 using Nini.Config;
@@ -58,7 +60,7 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             public PollServiceInventoryEventArgs thepoll;
             public UUID reqID;
-            public Hashtable request;
+            public OSHttpRequest request;
         }
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -333,11 +335,14 @@ namespace OpenSim.Region.ClientStack.Linden
                 response["int_response_code"] = 200;
                 response["content_type"] = "text/plain";
 
-                response["bin_response_data"] = System.Text.Encoding.UTF8.GetBytes(
+                response["bin_response_data"] = Encoding.UTF8.GetBytes(
                         m_webFetchHandler.FetchInventoryDescendentsRequest(
-                                    requestinfo.request["body"].ToString(),
+                                    requestinfo.request.InputStream,
                                     String.Empty, String.Empty, null, null)
                         );
+
+                requestinfo.request.InputStream.Dispose();
+
                 lock (responses)
                 {
                     lock(dropedResponses)
@@ -345,7 +350,6 @@ namespace OpenSim.Region.ClientStack.Linden
                         if(dropedResponses.Contains(requestID))
                         {
                             dropedResponses.Remove(requestID);
-                            requestinfo.request.Clear();
                             WebFetchInvDescModule.ProcessedRequestsCount++;
                             return;
                         }
@@ -355,7 +359,6 @@ namespace OpenSim.Region.ClientStack.Linden
                         m_log.WarnFormat("[FETCH INVENTORY DESCENDENTS2 MODULE]: Caught in the act of loosing responses! Please report this on mantis #7054");
                     responses[requestID] = response;
                 }
-                requestinfo.request.Clear();
                 WebFetchInvDescModule.ProcessedRequestsCount++;
             }
         }

OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs

@@ -13821,7 +13821,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     if ((cap.Flags & Caps.CapsFlags.ObjectAnim) != 0)
                     {
                         m_SupportObjectAnimations = true;
-                       ret |= 0x2000;
+                        ret |= 0x2000;
                     }
                 }
             }

OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs

@@ -26,9 +26,12 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
 using System.Reflection;
+using System.Text;
 using System.Net;
 using System.Net.Sockets;
 using log4net;
@@ -636,18 +639,18 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             return response;
         }
 
-        public void HttpRequestHandler(UUID requestID, Hashtable request)
+        public void HttpRequestHandler(UUID requestID, OSHttpRequest request)
         {
             lock (request)
             {
-                string uri = request["uri"].ToString();
+                string uri = request.RawUrl;
                 bool is_ssl = uri.Contains("lslhttps");
 
                 try
                 {
-                    Hashtable headers = (Hashtable)request["headers"];
+                    NameValueCollection headers = request.Headers;
 
-//                    string uri_full = "http://" + ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri;// "/lslhttp/" + urlcode.ToString() + "/";
+                    //string uri_full = "http://" + ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri;// "/lslhttp/" + urlcode.ToString() + "/";
 
                     int pos1 = uri.IndexOf("/");// /lslhttp
                     int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
@@ -656,8 +659,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     string uri_tmp = uri.Substring(0, pos3 + 1);
                     //HTTP server code doesn't provide us with QueryStrings
                     string pathInfo;
-                    string queryString;
+
-                    queryString = "";
 
                     pathInfo = uri.Substring(pos3);
 
@@ -676,6 +678,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     else
                     {
                         //m_log.Warn("[HttpRequestHandler]: http-in request failed; no such url: "+urlkey.ToString());
+                        request.InputStream.Dispose();
                         return;
                     }
 
@@ -699,38 +702,34 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                         string value = (string)header.Value;
                         requestData.headers.Add(key, value);
                     }
-                    foreach (DictionaryEntry de in request)
+
+                    if(request.QueryString.Count > 0)
                     {
-                        if (de.Key.ToString() == "querystringkeys")
+                        StringBuilder sb = new StringBuilder();
+                        foreach (DictionaryEntry qs in request.QueryString)
                         {
-                            System.String[] keys = (System.String[])de.Value;
+                            string key = (string)qs.Key;
-                            foreach (String key in keys)
+                            string value = (string)qs.Value;
+                            if (key != "")
                             {
-                                if (request.ContainsKey(key))
+                                sb.AppendFormat("{0} = {1}&",key, value);
-                                {
-                                    string val = (String)request[key];
-                                    if (key != "")
-                                    {
-                                        queryString = queryString + key + "=" + val + "&";
-                                    }
-                                    else
-                                    {
-                                        queryString = queryString + val + "&";
-                                }
                             }
+                            else
+                            {
+                                sb.AppendFormat("{0}&", value);
                             }
-                            if (queryString.Length > 1)
-                                queryString = queryString.Substring(0, queryString.Length - 1);
-
                         }
-
+                        if(sb.Length > 1)
+                            sb.Remove(sb.Length -1,1);
+                        requestData.headers["x-query-string"] = sb.ToString();
                     }
+                    else
+                        requestData.headers["x-query-string"] = String.Empty;
 
                     //if this machine is behind DNAT/port forwarding, currently this is being
                     //set to address of port forwarding router
                     requestData.headers["x-remote-ip"] = requestData.headers["remote_addr"];
                     requestData.headers["x-path-info"] = pathInfo;
-                    requestData.headers["x-query-string"] = queryString;
                     requestData.headers["x-script-url"] = url.url;
 
                     //requestData.ev = new ManualResetEvent(false);
@@ -744,10 +743,18 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                         m_RequestMap.Add(requestID, url);
                     }
 
-                    url.engine.PostScriptEvent(url.itemID, "http_request", new Object[] { requestID.ToString(), request["http-method"].ToString(), request["body"].ToString() });
+                    string requestBody;
+                    if (request.InputStream.Length > 0)
+                    {
+                        using (StreamReader reader = new StreamReader(request.InputStream, Encoding.UTF8))
+                            requestBody = reader.ReadToEnd();
+                    }
+                    else
+                        requestBody = string.Empty;
 
-                    //send initial response?
+                    request.InputStream.Dispose();
-//                    Hashtable response = new Hashtable();
+
+                    url.engine.PostScriptEvent(url.itemID, "http_request", new Object[] { requestID.ToString(), request.HttpMethod, requestBody });
 
                     return;
 

OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs

@@ -145,7 +145,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 for (int i = 0; i < alias.Length; ++i)
                 {
                     if (!string.IsNullOrWhiteSpace(alias[i]))
-                        m_ThisGateKeeperAlias.Add(alias[i].ToLower());
+                        m_ThisGateKeeperAlias.Add(alias[i].Trim().ToLower());
                 }
             }
             return true;

OpenSim/Tests/Common/Mock/TestOSHttpRequest.cs

@@ -137,7 +137,7 @@ namespace OpenSim.Tests.Common
             }
         }
 
-        public Hashtable Query
+        public Dictionary<string,string> Query
         {
             get
             {