Merge branch 'master' into m_test

5 files changed, 30 insertions, 18 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index f71ee86..2390118 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -143,7 +143,6 @@ namespace OpenSim.Framework
         public string RemotingAddress;
         public UUID ScopeID = UUID.Zero;
         private UUID m_maptileStaticUUID = UUID.Zero;
-        public string m_maptileStaticFile;
 
         public uint WorldLocX = 0;
         public uint WorldLocY = 0;
@@ -351,10 +350,7 @@ namespace OpenSim.Framework
             get { return m_maptileStaticUUID; }
         }
 
-        public string MaptileStaticFile
-        {
-            get { return m_maptileStaticFile; }
-        }
+        public string MaptileStaticFile { get; private set; }
         
         /// <summary>
         /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
@@ -723,7 +719,7 @@ namespace OpenSim.Framework
                 config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); 
             }
 
-            m_maptileStaticFile = config.GetString("MaptileStaticFile", String.Empty);
+            MaptileStaticFile = config.GetString("MaptileStaticFile", String.Empty);
             allKeys.Remove("MaptileStaticFile");
             
             #endregion
@@ -853,8 +849,8 @@ namespace OpenSim.Framework
             if (m_maptileStaticUUID != UUID.Zero)
                 config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString());
 
-            if (m_maptileStaticFile != String.Empty)
-                config.Set("MaptileStaticFile", m_maptileStaticFile);
+            if (MaptileStaticFile != String.Empty)
+                config.Set("MaptileStaticFile", MaptileStaticFile);
         }
 
         public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result)
@@ -966,7 +962,7 @@ namespace OpenSim.Framework
                                                 "UUID of a texture to use as the map for this region", m_maptileStaticUUID.ToString(), true);
 
             configMember.addConfigurationOption("region_static_mapfile", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Filename of a texture to use as the map for this region", m_maptileStaticFile, true);
+                                                "Filename of a texture to use as the map for this region", MaptileStaticFile, true);
         }
 
         public void loadConfigurationOptions()
@@ -1116,7 +1112,7 @@ namespace OpenSim.Framework
                     m_maptileStaticUUID = (UUID)configuration_result;
                     break;
                 case "region_static_mapfile":
-                    m_maptileStaticFile = (string)configuration_result;
+                    MaptileStaticFile = (string)configuration_result;
                     break;
             }
 
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index ea7f195..28324a5 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -833,7 +833,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             Stream inputStream = Util.Copy(request.InputStream);
 
-            if (request.ContentType == "application/x-gzip")
+            if ((request.Headers["Content-Encoding"] == "gzip") || (request.Headers["X-Content-Encoding"] == "gzip"))
                 inputStream = new GZipStream(inputStream, System.IO.Compression.CompressionMode.Decompress);
 
             using (StreamReader reader = new StreamReader(inputStream, Encoding.UTF8))
@@ -978,6 +978,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             Stream requestStream = request.InputStream;
 
+            if ((request.Headers["Content-Encoding"] == "gzip") || (request.Headers["X-Content-Encoding"] == "gzip"))
+                requestStream = new GZipStream(requestStream, System.IO.Compression.CompressionMode.Decompress);
+
             Encoding encoding = Encoding.UTF8;
             StreamReader reader = new StreamReader(requestStream, encoding);
 
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
index 3171759..05ec6dc 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
@@ -182,11 +182,22 @@ namespace OpenSim.Framework.Servers.HttpServer
             _context = context;
 
             if (null != req.Headers["content-encoding"])
-                _contentEncoding = Encoding.GetEncoding(_request.Headers["content-encoding"]);
+            {
+                try
+                {
+                    _contentEncoding = Encoding.GetEncoding(_request.Headers["content-encoding"]);
+                }
+                catch (Exception)
+                {
+                    // ignore
+                }
+            }
+            
             if (null != req.Headers["content-type"])
                 _contentType = _request.Headers["content-type"];
             if (null != req.Headers["user-agent"])
                 _userAgent = req.Headers["user-agent"];
+            
             if (null != req.Headers["remote_addr"])
             {
                 try
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index ce4af8b..c7a7341 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2031,7 +2031,7 @@ namespace OpenSim.Framework
         // Maps (ThreadFunc number -> Thread)
         private static ConcurrentDictionary<long, ThreadInfo> activeThreads = new ConcurrentDictionary<long, ThreadInfo>();
 
-        private static readonly int THREAD_TIMEOUT = 60 * 1000;
+        private static readonly int THREAD_TIMEOUT = 10 * 60 * 1000;    // 10 minutes
 
         /// <summary>
         /// Finds threads in the main thread pool that have timed-out, and aborts them.
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 10a2560..89181a9 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -250,9 +250,12 @@ namespace OpenSim.Framework
 
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
 
+                    request.ContentType = "application/json";
+                    
                     if (compressed)
                     {
-                        request.ContentType = "application/x-gzip";
+                        request.Headers["X-Content-Encoding"] = "gzip"; // can't set "Content-Encoding" because old OpenSims fail if they get an unrecognized Content-Encoding
+
                         using (MemoryStream ms = new MemoryStream())
                         {
                             using (GZipStream comp = new GZipStream(ms, CompressionMode.Compress))
@@ -270,10 +273,9 @@ namespace OpenSim.Framework
                     }
                     else
                     {
-                        request.ContentType = "application/json";
                         request.ContentLength = buffer.Length;   //Count bytes to send
                         using (Stream requestStream = request.GetRequestStream())
-                                requestStream.Write(buffer, 0, buffer.Length);         //Send it
+                            requestStream.Write(buffer, 0, buffer.Length);         //Send it
                     }
                 }
                 
@@ -1024,7 +1026,7 @@ namespace OpenSim.Framework
                     }
                     catch (Exception e)
                     {
-                        m_log.ErrorFormat("[FORMS]: Error sending request to {0}: {1}. Request: {2}", requestUrl, e.Message,
+                        m_log.InfoFormat("[FORMS]: Error sending request to {0}: {1}. Request: {2}", requestUrl, e.Message,
                             obj.Length > WebUtil.MaxRequestDiagLength ? obj.Remove(WebUtil.MaxRequestDiagLength) : obj);
                         throw e;
                     }
@@ -1052,7 +1054,7 @@ namespace OpenSim.Framework
                 }
                 catch (Exception e)
                 {
-                    m_log.ErrorFormat("[FORMS]: Error receiving response from {0}: {1}. Request: {2}", requestUrl, e.Message,
+                    m_log.InfoFormat("[FORMS]: Error receiving response from {0}: {1}. Request: {2}", requestUrl, e.Message,
                         obj.Length > WebUtil.MaxRequestDiagLength ? obj.Remove(WebUtil.MaxRequestDiagLength) : obj);
                     throw e;
                 }