2 files changed, 168 insertions, 113 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 9dfeb96..f5b575b 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -28,15 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Mail;
 using System.Net.Security;
-using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Security.Cryptography.X509Certificates;
-using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -45,6 +42,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Mono.Addins;
+using Amib.Threading;
 
 /*****************************************************
  *
@@ -108,6 +106,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         private Dictionary<UUID, HttpRequestClass> m_pendingRequests;
         private Scene m_scene;
         // private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>();
+        public static SmartThreadPool ThreadPool = null;
 
         public HttpRequestModule()
         {
@@ -191,7 +190,15 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
                         case (int)HttpRequestConstants.HTTP_BODY_MAXLENGTH:
 
-                            // TODO implement me
+                            int len;
+                            if(int.TryParse(parms[i + 1], out len))
+                            {
+                                if(len > HttpRequestClass.HttpBodyMaxLenMAX)
+                                    len = HttpRequestClass.HttpBodyMaxLenMAX;
+                                else if(len < 64) //???
+                                    len = 64;
+                                htc.HttpBodyMaxLen = len;
+                            }
                             break;
 
                         case (int)HttpRequestConstants.HTTP_VERIFY_CERT:
@@ -216,20 +223,16 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                                 if (parms.Length - i < 2)
                                     break;
 
-                                //Have we reached the end of the list of headers?
-                                //End is marked by a string with a single digit.
-                                //We already know we have at least one parameter
-                                //so it is safe to do this check at top of loop.
-                                if (Char.IsDigit(parms[i][0]))
-                                    break;
-
                                 if (htc.HttpCustomHeaders == null)
                                     htc.HttpCustomHeaders = new List<string>();
 
                                 htc.HttpCustomHeaders.Add(parms[i]);
                                 htc.HttpCustomHeaders.Add(parms[i+1]);
+                                int nexti = i + 2;
+                                if (nexti >= parms.Length || Char.IsDigit(parms[nexti][0]))
+                                    break;
 
-                                i += 2;
+                                i = nexti;
                             }
                             break;
 
@@ -239,7 +242,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     }
                 }
             }
-                        
+
             htc.RequestModule = this;
             htc.LocalID = localID;
             htc.ItemID = itemID;
@@ -276,7 +279,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         }
 
         public bool StartHttpRequest(HttpRequestClass req)
-        {          
+        {
             if (!CheckAllowed(new Uri(req.Url)))
                 return false;
 
@@ -290,29 +293,18 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             return true;
         }
 
-        public void StopHttpRequestsForScript(UUID id)
+        public void StopHttpRequest(uint m_localID, UUID m_itemID)
         {
             if (m_pendingRequests != null)
             {
-                List<UUID> keysToRemove = null;
-
                 lock (HttpListLock)
                 {
-                    foreach (HttpRequestClass req in m_pendingRequests.Values)
+                    HttpRequestClass tmpReq;
+                    if (m_pendingRequests.TryGetValue(m_itemID, out tmpReq))
                     {
-                        if (req.ItemID == id)
-                        {
-                            req.Stop();
-
-                            if (keysToRemove == null)
-                                keysToRemove = new List<UUID>();
-
-                            keysToRemove.Add(req.ReqID);
-                        }
+                        tmpReq.Stop();
+                        m_pendingRequests.Remove(m_itemID);
                     }
-
-                    if (keysToRemove != null)
-                        keysToRemove.ForEach(keyToRemove => m_pendingRequests.Remove(keyToRemove));
                 }
             }
         }
@@ -330,13 +322,19 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         {
             lock (HttpListLock)
             {
-                foreach (HttpRequestClass req in m_pendingRequests.Values)
+                foreach (UUID luid in m_pendingRequests.Keys)
                 {
-                    if (req.Finished)
-                        return req;
+                    HttpRequestClass tmpReq;
+
+                    if (m_pendingRequests.TryGetValue(luid, out tmpReq))
+                    {
+                        if (tmpReq.Finished)
+                        {
+                            return tmpReq;
+                        }
+                    }
                 }
             }
-
             return null;
         }
 
@@ -363,9 +361,34 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
             m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
 
+            HttpRequestClass.HttpBodyMaxLenMAX = config.Configs["Network"].GetInt("HttpBodyMaxLenMAX", 16384);
+
+
             m_outboundUrlFilter = new OutboundUrlFilter("Script HTTP request module", config);
+            int maxThreads = 15;
+
+            IConfig httpConfig = config.Configs["HttpRequestModule"];
+            if (httpConfig != null)
+            {
+                maxThreads = httpConfig.GetInt("MaxPoolThreads", maxThreads);
+            }
 
             m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
+
+            // First instance sets this up for all sims
+            if (ThreadPool == null)
+            {
+                STPStartInfo startInfo = new STPStartInfo();
+                startInfo.IdleTimeout = 2000;
+                startInfo.MaxWorkerThreads = maxThreads;
+                startInfo.MinWorkerThreads = 0;
+                startInfo.ThreadPriority = ThreadPriority.BelowNormal;
+                startInfo.StartSuspended = true;
+                startInfo.ThreadPoolName = "ScriptsHttpReq";
+
+                ThreadPool = new SmartThreadPool(startInfo);
+                ThreadPool.Start();
+            }
         }
 
         public void AddRegion(Scene scene)
@@ -392,6 +415,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
         public void Close()
         {
+            ThreadPool.Shutdown();
         }
 
         public string Name
@@ -409,8 +433,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
     public class HttpRequestClass : IServiceRequest
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
         // Constants for parameters
         // public const int HTTP_BODY_MAXLENGTH = 2;
         // public const int HTTP_METHOD = 0;
@@ -430,13 +452,17 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         {
             get { return _finished; }
         }
-        // public int HttpBodyMaxLen = 2048; // not implemented
+
+        public static int HttpBodyMaxLenMAX = 16384;
 
         // Parameter members and default values
+        public int HttpBodyMaxLen = 2048;
         public string HttpMethod  = "GET";
         public string HttpMIMEType = "text/plain;charset=utf-8";
         public int HttpTimeout;
         public bool HttpVerifyCert = true;
+        public IWorkItemResult WorkItem = null;
+
         //public bool HttpVerboseThrottle = true; // not implemented
         public List<string> HttpCustomHeaders = null;
         public bool HttpPragmaNoCache = true;
@@ -484,15 +510,40 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
         public void Process()
         {
+            _finished = false;
+
+            lock (HttpRequestModule.ThreadPool)
+                WorkItem = HttpRequestModule.ThreadPool.QueueWorkItem(new WorkItemCallback(StpSendWrapper), null);
+        }
+
+        private object StpSendWrapper(object o)
+        {
             SendRequest();
+            return null;
         }
 
+        /*
+         * TODO: More work on the response codes.  Right now
+         * returning 200 for success or 499 for exception
+         */
+
         public void SendRequest()
         {
+            HttpWebResponse response = null;
+            Stream resStream = null;
+            byte[] buf = new byte[HttpBodyMaxLenMAX + 16];
+            string tempString = null;
+            int count = 0;
+
             try
             {
                 Request = (HttpWebRequest)WebRequest.Create(Url);
-                Request.AllowAutoRedirect = false;               
+                Request.AllowAutoRedirect = false;
+                Request.KeepAlive = false;
+
+                //This works around some buggy HTTP Servers like Lighttpd
+                Request.ServicePoint.Expect100Continue = false;
+
                 Request.Method = HttpMethod;
                 Request.ContentType = HttpMIMEType;
 
@@ -500,7 +551,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                 {
                     // We could hijack Connection Group Name to identify
                     // a desired security exception.  But at the moment we'll use a dummy header instead.
-//                    Request.ConnectionGroupName = "NoVerify";
                     Request.Headers.Add("NoVerifyCert", "true");
                 }
 //                else
@@ -533,14 +583,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     }
                 }
 
-                if (ResponseHeaders != null)
-                {
-                    foreach (KeyValuePair<string, string> entry in ResponseHeaders)
-                        if (entry.Key.ToLower().Equals("user-agent") && Request is HttpWebRequest)
-                            ((HttpWebRequest)Request).UserAgent = entry.Value;
-                        else
-                            Request.Headers[entry.Key] = entry.Value;
-                }
+                foreach (KeyValuePair<string, string> entry in ResponseHeaders)
+                    if (entry.Key.ToLower().Equals("user-agent"))
+                        Request.UserAgent = entry.Value;
+                    else
+                        Request.Headers[entry.Key] = entry.Value;
 
                 // Encode outbound data
                 if (!string.IsNullOrEmpty(OutboundBody))
@@ -552,12 +599,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                         bstream.Write(data, 0, data.Length);
                 }
 
+                Request.Timeout = HttpTimeout;
                 try
                 {
-                    IAsyncResult result = (IAsyncResult)Request.BeginGetResponse(ResponseCallback, null);
-
-                    ThreadPool.RegisterWaitForSingleObject(
-                        result.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), null, HttpTimeout, true);
+                    // execute the request
+                    response = (HttpWebResponse) Request.GetResponse();
                 }
                 catch (WebException e)
                 {
@@ -565,67 +611,74 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     {
                         throw;
                     }
+                    response = (HttpWebResponse)e.Response;
+                }
 
-                    HttpWebResponse response = (HttpWebResponse)e.Response;
+                Status = (int)response.StatusCode;
 
-                    Status = (int)response.StatusCode;
-                    ResponseBody = response.StatusDescription;
-                    _finished = true;
-                }
-            }
-            catch (Exception e)
-            {
-//                m_log.Debug(
-//                    string.Format("[SCRIPTS HTTP REQUESTS]: Exception on request to {0} for {1}  ", Url, ItemID), e);
+                resStream = response.GetResponseStream();
+                int totalBodyBytes = 0;
+                int maxBytes = HttpBodyMaxLen;
+                if(maxBytes > buf.Length)
+                    maxBytes = buf.Length;
 
-                Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                ResponseBody = e.Message;
-                _finished = true;
-            }
-        }
+                // we need to read all allowed or UFT8 conversion may fail
+                do
+                {
+                    // fill the buffer with data
+                    count = resStream.Read(buf, totalBodyBytes, maxBytes - totalBodyBytes);
+                    totalBodyBytes += count;
+                    if (totalBodyBytes >= maxBytes)
+                        break;
 
-        private void ResponseCallback(IAsyncResult ar)
-        {
-            HttpWebResponse response = null;
+                } while (count > 0); // any more data to read?
 
-            try
-            {
-                try
+                if(totalBodyBytes > 0)
                 {
-                    response = (HttpWebResponse)Request.EndGetResponse(ar);
+                    tempString = Util.UTF8.GetString(buf, 0, totalBodyBytes);
+                    ResponseBody = tempString.Replace("\r", "");
                 }
-                catch (WebException e)
+                else
+                    ResponseBody = "";
+            }
+            catch (WebException e)
+            {
+                if (e.Status == WebExceptionStatus.ProtocolError)
                 {
-                    if (e.Status != WebExceptionStatus.ProtocolError)
+                    HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response;
+                    Status = (int)webRsp.StatusCode;
+                    try
                     {
-                        throw;
+                        using (Stream responseStream = webRsp.GetResponseStream())
+                        {
+                            using (StreamReader reader = new StreamReader(responseStream))
+                                ResponseBody = reader.ReadToEnd();
+                        }
+                    }
+                    catch
+                    {
+                        ResponseBody = webRsp.StatusDescription;
                     }
-
-                    response = (HttpWebResponse)e.Response;
                 }
-
-                Status = (int)response.StatusCode;
-
-                using (Stream stream = response.GetResponseStream())
+                else
                 {
-                    StreamReader reader = new StreamReader(stream, Encoding.UTF8);
-                    ResponseBody = reader.ReadToEnd();
-                } 
+                    Status = (int)OSHttpStatusCode.ClientErrorJoker;
+                    ResponseBody = e.Message;
+                }
             }
             catch (Exception e)
             {
-                Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                ResponseBody = e.Message;
-
-//                m_log.Debug(
-//                    string.Format("[SCRIPTS HTTP REQUESTS]: Exception on response to {0} for {1}  ", Url, ItemID), e);
+                // Don't crash on anything else
             }
             finally
             {
+                if (resStream != null)
+                    resStream.Close();
                 if (response != null)
                     response.Close();
 
-                // We need to resubmit 
+
+                // We need to resubmit
                 if (
                     (Status == (int)HttpStatusCode.MovedPermanently
                         || Status == (int)HttpStatusCode.Found
@@ -670,22 +723,24 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                 else
                 {
                     _finished = true;
+                    if (ResponseBody == null)
+                        ResponseBody = String.Empty;
                 }
             }
         }
 
-        private void TimeoutCallback(object state, bool timedOut)
-        {
-            if (timedOut)
-                Request.Abort();
-        }
-
         public void Stop()
         {
-//            m_log.DebugFormat("[SCRIPTS HTTP REQUESTS]: Stopping request to {0} for {1}  ", Url, ItemID);
-
-            if (Request != null)
-                Request.Abort();
+            try
+            {
+                if (!WorkItem.Cancel())
+                {
+                    WorkItem.Cancel(true);
+                }
+            }
+            catch (Exception)
+            {
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
index d22487e..7e223d7 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
@@ -45,7 +45,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
 {
     class TestWebRequestCreate : IWebRequestCreate
-    {       
+    {
         public TestWebRequest NextRequest { get; set; }
 
         public WebRequest Create(Uri uri)
@@ -65,13 +65,13 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
 
         public Func<IAsyncResult, WebResponse> OnEndGetResponse { get; set; }
 
-        public TestWebRequest() : base() 
+        public TestWebRequest() : base()
         {
 //            Console.WriteLine("created");
         }
 
-//        public TestWebRequest(SerializationInfo serializationInfo, StreamingContext streamingContext) 
-//            : base(serializationInfo, streamingContext) 
+//        public TestWebRequest(SerializationInfo serializationInfo, StreamingContext streamingContext)
+//            : base(serializationInfo, streamingContext)
 //        {
 //            Console.WriteLine("created");
 //        }
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
         public string Response { get; set; }
 
 #pragma warning disable 0618
-        public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) 
+        public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext)
             : base(serializationInfo, streamingContext) {}
 #pragma warning restore 0618
 
@@ -111,24 +111,24 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
     {
         WaitHandle m_wh = new ManualResetEvent(true);
 
-        object IAsyncResult.AsyncState 
+        object IAsyncResult.AsyncState
         {
             get {
                 throw new System.NotImplementedException ();
             }
         }
 
-        WaitHandle IAsyncResult.AsyncWaitHandle 
+        WaitHandle IAsyncResult.AsyncWaitHandle
         {
             get { return m_wh; }
         }
 
-        bool IAsyncResult.CompletedSynchronously 
+        bool IAsyncResult.CompletedSynchronously
         {
             get { return false; }
         }
 
-        bool IAsyncResult.IsCompleted 
+        bool IAsyncResult.IsCompleted
         {
             get { return true; }
         }
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
             TestHelpers.EnableLogging();
 
             if (!Util.IsPlatformMono)
-                Assert.Ignore("Ignoring test since can only currently run on Mono");           
+                Assert.Ignore("Ignoring test since can only currently run on Mono");
 
             string rawResponse = "boom";
 
@@ -163,7 +163,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
 
             TestWebRequest twr = new TestWebRequest();
             //twr.OnEndGetResponse += ar => new TestHttpWebResponse(null, new StreamingContext());
-            twr.OnEndGetResponse += ar => 
+            twr.OnEndGetResponse += ar =>
             {
                 SerializationInfo si = new SerializationInfo(typeof(HttpWebResponse), new FormatterConverter());
                 StreamingContext sc = new StreamingContext();