From 12ee3a3c93c99752730bf17f354f17660911010f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 14 May 2010 21:40:37 +0100
Subject: change 0.6.9 flavour to post-fixes

---
 OpenSim/Framework/Servers/VersionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers')

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index f8ed5ae..fb41ef3 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -30,7 +30,7 @@ namespace OpenSim
     public class VersionInfo
     {
         private const string VERSION_NUMBER = "0.6.9";
-        private const Flavour VERSION_FLAVOUR = Flavour.RC1;
+        private const Flavour VERSION_FLAVOUR = Flavour.Post_Fixes;
 
         public enum Flavour
         {
-- 
cgit v1.1


From 5fc990d9e78498afe8221a97fdd1f0dd5e7e314f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 25 Mar 2010 20:33:46 +0000
Subject: put out full exception stack if something reaches top of base http
 server OnRequest() on both mono and .net replace Newtonsoft.Json.XML since
 the updated copy got accidentally reverted by another commit

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers')

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 214f936..7c9e51e 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -311,7 +311,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0} {1}", e.Message, e.StackTrace);
+                m_log.Error(string.Format("[BASE HTTP SERVER]: OnRequest() failed with "), e);
             }
         }
 
-- 
cgit v1.1


From fa8def5e709a5136722ca1ffa0e7b46aacaab8c5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 25 Mar 2010 21:36:57 +0000
Subject: minor: Print out port that http servers are using do this in callers
 so that we know who is setting up these things

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'OpenSim/Framework/Servers')

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 7c9e51e..297d047 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1572,7 +1572,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public void Start()
         {
-            m_log.Info("[BASE HTTP SERVER]: Starting up HTTP Server");
             StartHTTP();
         }
 
@@ -1580,7 +1579,6 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             try
             {
-                m_log.Debug("[BASE HTTP SERVER]: Spawned main thread OK");
                 //m_httpListener = new HttpListener();
                 NotSocketErrors = 0;
                 if (!m_ssl)
-- 
cgit v1.1