1 files changed, 111 insertions, 69 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 6793fc8..6eb25ef 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;
 
 /*****************************************************
  *
@@ -105,6 +103,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()
         {
@@ -253,29 +252,18 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             return reqID;
         }
 
-        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));
                 }
             }
         }
@@ -293,13 +281,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;
         }
 
@@ -326,7 +320,30 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
             m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
 
+            int maxThreads = 50;
+
+            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 = 20000;
+                startInfo.MaxWorkerThreads = maxThreads;
+                startInfo.MinWorkerThreads = 5;
+                startInfo.ThreadPriority = ThreadPriority.BelowNormal;
+                startInfo.StartSuspended = true;
+
+                ThreadPool = new SmartThreadPool(startInfo);
+
+                ThreadPool.Start();
+            }
         }
 
         public void AddRegion(Scene scene)
@@ -370,8 +387,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;
@@ -392,6 +407,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         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;
@@ -428,7 +445,16 @@ 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;
         }
 
         /*
@@ -439,10 +465,18 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         public void SendRequest()
         {
             HttpWebResponse response = null;
+            StringBuilder sb = new StringBuilder();
+            byte[] buf = new byte[8192];
+            string tempString = null;
+            int count = 0;
 
             try
             {
                 Request = (HttpWebRequest) WebRequest.Create(Url);
+
+                //This works around some buggy HTTP Servers like Lighttpd
+                Request.ServicePoint.Expect100Continue = false;
+
                 Request.Method = HttpMethod;
                 Request.ContentType = HttpMIMEType;
 
@@ -450,7 +484,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
@@ -497,12 +530,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     bstream.Close();
                 }
 
+                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)
                 {
@@ -511,31 +543,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                         throw;
                     }
                     response = (HttpWebResponse)e.Response;
-                    _finished = true;
                 }
-            }
-            catch (Exception e)
-            {
-                Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                ResponseBody = e.Message;
-                _finished = true;
-            }
-        }
 
-        private void ResponseCallback(IAsyncResult ar)
-        {
-            HttpWebResponse response = null;
-
-            try
-            {
-                response = (HttpWebResponse)Request.EndGetResponse(ar);
                 Status = (int)response.StatusCode;
 
                 Stream resStream = response.GetResponseStream();
-                StringBuilder sb = new StringBuilder();
-                byte[] buf = new byte[8192];
-                string tempString = null;
-                int count = 0;
 
                 do
                 {
@@ -550,41 +562,71 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
                         // continue building the string
                         sb.Append(tempString);
+                        if (sb.Length > 2048)
+                            break;
                     }
-                } 
-                while (count > 0); // any more data to read?
+                } while (count > 0); // any more data to read?
 
-                ResponseBody = sb.ToString();         
+                ResponseBody = sb.ToString().Replace("\r", "");
             }
-            catch (Exception e)
+            catch (WebException e)
             {
-                Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                ResponseBody = e.Message;
+                if (e.Status == WebExceptionStatus.ProtocolError)
+                {
+                    HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response;
+                    Status = (int)webRsp.StatusCode;
+                    try
+                    {
+                        using (Stream responseStream = webRsp.GetResponseStream())
+                        {
+                            ResponseBody = responseStream.GetStreamString();
+                        }
+                    }
+                    catch
+                    {
+                        ResponseBody = webRsp.StatusDescription;
+                    }
+                }
+                else
+                {
+                    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);
+                if (ResponseBody == null)
+                    ResponseBody = String.Empty;
+
+                _finished = true;
+                return;
+            }
+            catch (Exception e)
+            {
+                // Don't crash on anything else
             }
             finally
             {
                 if (response != null)
                     response.Close();
-
-                _finished = true;
             }
-        }
 
-        private void TimeoutCallback(object state, bool timedOut)
-        {
-            if (timedOut)
-                Request.Abort();
+            if (ResponseBody == null)
+                ResponseBody = String.Empty;
+
+            _finished = true;
         }
 
         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)
+            {
+            }
         }
     }
 }