From 874036fd347f8a74a58ea3aa3fdda571e821cd96 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 24 Jun 2010 10:25:34 +0000
Subject: [PATCH] Must get in the habit of updating the 7.0.x changelog

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a1056a521..44e6a1752 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -102,6 +102,11 @@
         <bug>49475</bug>: Use new role name for manager application access on
         the ROOT web application's index page. (markt)
       </fix>
+      <fix>
+        <bug>49476</bug>: CSRF protection was preventing access to the session
+        expiration features. Also switch the manager application to the generic
+        CSRF protection filter. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>
-- 
2.11.0