From 5034a514a691174a41d77108b1789a2b8a846949 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 7 Oct 2010 14:21:55 +0000
Subject: [PATCH] Couple of updates.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1005459 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/changelog.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8df6917d0..80cb17f4d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -75,6 +75,12 @@
         cleared all work directories (with compiled JSPs and persisted sessions)
         when Tomcat was stopped. (markt)
       </fix>
+      <fix>
+        <bug>49978</bug>: Correctly handle the case when a directory expected
+        to be created during web application start is already present. Rather
+        than throwing an exception and failing to start, allow thw web
+        application to start normally. (mark)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
@@ -84,11 +90,15 @@
         to ensure APR connector shuts down properly. (mturk) 
       </fix>
       <fix>
+        <bug>49972</bug>: Fix potential thread safe issue when formatting dates
+        for us in HTTP headers. (markt)
+      </fix>
+      <fix>
         <bug>50054</bug>: Correctly handle the setting of minSpareThreads in 
         AJP connector. (kfujino) 
       </fix>
       <fix>
-        Set not maxThreads  but minSpareThreads to corePoolSize, if 
+        Set not maxThreads but minSpareThreads to corePoolSize, if 
         AbstractEndpoint.setMinSpareThreads is called. (kfujino) 
       </fix>
     </changelog>
-- 
2.11.0