+++ /dev/null
---- apache-tomcat-5.5.27-src/container/webapps/admin/WEB-INF/struts-config.xml~ 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/WEB-INF/struts-config.xml 2009-04-11 04:19:16.000000000 +0200
-@@ -478,6 +478,9 @@
-
- <action-mappings>
-
-+ <!-- Ugly PLD hack, that makes it working -->
-+ <action path="/login.jsp" unknown="true"/>
-+
- <!-- Dump registry information (debugging) -->
- <action path="/dumpRegistry"
- type="org.apache.webapp.admin.DumpRegistryAction"/>
+++ /dev/null
---- apache-tomcat-5.5.23-src/build/build.xml~ 2007-12-07 09:25:44.906016657 +0200
-+++ apache-tomcat-5.5.23-src/build/build.xml 2007-12-07 09:34:23.553415095 +0200
-@@ -663,7 +663,7 @@
- <param name="destfile" value="${tomcat-dbcp.jar}" />
- </antcall>
-
-- <antcall target="build-tomcat-dbcp" />
-+ <!--<antcall target="build-tomcat-dbcp" />-->
-
- <!--
- <antcall target="downloadzip">
+++ /dev/null
---- apache-tomcat-5.5.23-src/build/build.xml~ 2007-04-12 01:16:15.447593367 +0300
-+++ apache-tomcat-5.5.23-src/build/build.xml 2007-04-12 01:16:40.598160416 +0300
-@@ -1970,11 +1973,13 @@
- <param name="destfile" value="${commons-daemon.jar}"/>
- </antcall>
-
-+ <!--
- <antcall target="downloadfile">
- <param name="sourcefile" value="${tomcat-native.loc}"/>
- <param name="destfile" value="${tomcat-native.tar.gz}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-+ -->
-
- <!-- Build the dependencies that are not yet released -->
- <antcall target="build-depends"/>
+++ /dev/null
---- apache-tomcat-5.5.23-src/build/build.xml 2007-04-18 00:09:15.076256315 +0300
-+++ apache-tomcat-5.5.23-src/build/build.xml 2007-04-19 22:15:14.256788067 +0300
-@@ -149,8 +149,9 @@
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
- failonerror="false" />
-
-+ <!--
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-- file="${tomcat-native.tar.gz}" />
-+ file="${tomcat-native.tar.gz}" />-->
-
- <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
- <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
-@@ -1420,6 +1421,7 @@
- </copy>
-
- <!-- tomcat connectors source -->
-+ <!--
- <copy todir="${tomcat.dist}/src/${jtc.project}">
- <fileset dir="${jtc.home}">
- <exclude name="coyote/build/**"/>
-@@ -1431,6 +1433,7 @@
- <exclude name="build.properties"/>
- </fileset>
- </copy>
-+ -->
- </target>
-
-
+++ /dev/null
---- apache-tomcat-5.5.27-src/container/webapps/ROOT/index.jsp 2008-08-29 05:14:00.000000000 +0200
-+++ apache-tomcat-5.5.27-src.new/container/webapps/ROOT/index.jsp 2009-04-16 10:12:27.576052969 +0200
-@@ -164,8 +164,6 @@
- </tr>
- <tr>
- <td class="menu">
-- <a href="jsp-examples/">JSP Examples</a><br/>
-- <a href="servlets-examples/">Servlet Examples</a><br/>
- <a href="webdav/">WebDAV capabilities</a><br/>
-
- </td>
-@@ -208,8 +206,6 @@
- is restricted to users with role "manager".</b>
- Users are defined in <code>$CATALINA_HOME/conf/tomcat-users.xml</code>.</p>
-
-- <p>Included with this release are a host of sample Servlets and JSPs (with associated source code), extensive documentation (including the Servlet 2.4 and JSP 2.0 API JavaDoc), and an introductory guide to developing web applications.</p>
--
- <p>Tomcat mailing lists are available at the Tomcat project web site:</p>
-
- <ul>
+++ /dev/null
---- apache-tomcat-5.5.23-src/build/build.xml~ 2007-03-05 17:27:32.000000000 +0200
-+++ apache-tomcat-5.5.23-src/build/build.xml 2007-04-12 01:12:46.832890067 +0300
-@@ -1955,11 +1955,13 @@
- <param name="destfile" value="${commons-httpclient.jar}"/>
- </antcall>
-
-+ <!--
- <antcall target="downloadfile">
- <param name="sourcefile" value="${nsis.loc}"/>
- <param name="destfile" value="${nsis.exe}"/>
- <param name="destdir" value="${nsis.home}"/>
- </antcall>
-+ -->
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${struts.loc}"/>
+++ /dev/null
---- apache-tomcat-5.5.23-src/build/build.xml~ 2007-04-19 23:08:15.507438570 +0300
-+++ apache-tomcat-5.5.23-src/build/build.xml 2007-04-19 23:08:49.088179972 +0300
-@@ -660,11 +660,13 @@
-
- <antcall target="build-tomcat-dbcp" />
-
-+ <!--
- <antcall target="downloadzip">
- <param name="sourcefile" value="${jdt.loc}"/>
- <param name="destfile" value="${jdt.jar}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
-+ -->
- <antcall target="build-jasper-compiler-jdt" />
- </target>
-
+++ /dev/null
---- apache-tomcat-5.5.23-src/build/build.xml 2007-04-19 23:24:44.409317738 +0300
-+++ apache-tomcat-5.5.23-src/build/build.xml 2007-04-19 23:26:17.961392267 +0300
-@@ -99,16 +99,6 @@
- <mkdir dir="${tomcat.build}/server/lib" />
- <mkdir dir="${tomcat.build}/common/lib" />
-
-- <uptodate property="servletapi.build.notrequired"
-- targetfile="${servlet-api.jar}">
-- <srcfiles dir="${api.home}/jsr154/src" includes="**" />
-- </uptodate>
--
-- <uptodate property="jspapi.build.notrequired"
-- targetfile="${jsp-api.jar}">
-- <srcfiles dir="${api.home}/jsr152/src" includes="**" />
-- </uptodate>
--
- <uptodate property="tomcatutil.build.notrequired"
- targetfile="${tomcat.build}/server/lib/tomcat-util.jar">
- <srcfiles dir="${jtc.home}/util/java" includes="**" />
-@@ -439,6 +429,7 @@
- addWebXmlMappings="true"
- outputDir="${ROOT.base}/WEB-INF/src" />
-
-+ <!--
- <jasper2
- compile="false"
- validateXml="false"
-@@ -446,6 +437,7 @@
- webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
- addWebXmlMappings="true"
- outputDir="${jsp-examples.base}/WEB-INF/src" />
-+ -->
-
- <jasper2
- package="admin"
-@@ -484,6 +476,7 @@
- </fileset>
- </copy>
-
-+ <!--
- <javac destdir="${jsp-examples.base}/WEB-INF/classes"
- optimize="off"
- debug="${compile.debug}"
-@@ -509,6 +502,7 @@
- <include name="**" />
- <exclude name="tags/**" />
- </javac>
-+ -->
-
- <javac destdir="${admin.base}/WEB-INF/classes"
- optimize="off"
-@@ -649,8 +643,8 @@
-
- <target name="build-depends" depends="init"
- description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">
-- <antcall target="build-servletapi"/>
-- <antcall target="build-jspapi"/>
-+ <!-- <antcall target="build-servletapi"/> -->
-+ <!-- <antcall target="build-jspapi"/> -->
-
- <!-- <antcall target="build-commons-modeler" /> -->
- <!-- <antcall target="build-commons-daemon" /> -->
-@@ -765,6 +759,7 @@
- <mkdir dir="${tomcat.build}/server/webapps" />
-
- <!-- The build files are far too difficult to hack - just build it and copy -->
-+ <!--
- <ant dir="${api.home}/jsr154" target="dist">
- </ant>
- <ant dir="${api.home}/jsr152" target="dist">
-@@ -781,6 +776,7 @@
- <exclude name="WEB-INF/tagPlugins.xml" />
- </fileset>
- </copy>
-+ -->
-
- <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
- <property name="webapps.build" value="${tomcat.build}/webapps" />
+++ /dev/null
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/banner.jsp apache-tomcat-5.5.27-src/container/webapps/admin/banner.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/banner.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/banner.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <!-- Standard Content -->
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/blank.jsp apache-tomcat-5.5.27-src/container/webapps/admin/blank.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/blank.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/blank.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <!-- Standard Content -->
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/connector/connector.jsp apache-tomcat-5.5.27-src/container/webapps/admin/connector/connector.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/connector/connector.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/connector/connector.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/connector/connectors.jsp apache-tomcat-5.5.27-src/container/webapps/admin/connector/connectors.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/connector/connectors.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/connector/connectors.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/context/context.jsp apache-tomcat-5.5.27-src/container/webapps/admin/context/context.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/context/context.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/context/context.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/context/contexts.jsp apache-tomcat-5.5.27-src/container/webapps/admin/context/contexts.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/context/contexts.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/context/contexts.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/dumpRegistry.jsp apache-tomcat-5.5.27-src/container/webapps/admin/dumpRegistry.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/dumpRegistry.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/dumpRegistry.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <!-- Standard Content -->
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/dumpServer.jsp apache-tomcat-5.5.27-src/container/webapps/admin/dumpServer.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/dumpServer.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/dumpServer.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <!-- Standard Content -->
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/error.jsp apache-tomcat-5.5.27-src/container/webapps/admin/error.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/error.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/error.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <!-- Standard Content -->
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/frameset.jsp apache-tomcat-5.5.27-src/container/webapps/admin/frameset.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/frameset.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/frameset.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -25,7 +25,7 @@
- getServletContext().getNamedDispatcher("action").include(request,response);
- %>
-
--<html:html locale="true">
-+<html:html>
-
- <!-- Standard Content -->
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/host/aliases.jsp apache-tomcat-5.5.27-src/container/webapps/admin/host/aliases.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/host/aliases.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/host/aliases.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/host/alias.jsp apache-tomcat-5.5.27-src/container/webapps/admin/host/alias.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/host/alias.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/host/alias.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/host/host.jsp apache-tomcat-5.5.27-src/container/webapps/admin/host/host.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/host/host.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/host/host.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/host/hosts.jsp apache-tomcat-5.5.27-src/container/webapps/admin/host/hosts.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/host/hosts.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/host/hosts.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/login.jsp apache-tomcat-5.5.27-src/container/webapps/admin/login.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/login.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/login.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -25,7 +25,7 @@
- getServletContext().getNamedDispatcher("action").include(request,response);
- %>
-
--<html:html locale="true">
-+<html:html>
-
- <!-- Make sure window is not in a frame -->
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/dataSourceRealm.jsp apache-tomcat-5.5.27-src/container/webapps/admin/realm/dataSourceRealm.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/dataSourceRealm.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/realm/dataSourceRealm.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/jdbcRealm.jsp apache-tomcat-5.5.27-src/container/webapps/admin/realm/jdbcRealm.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/jdbcRealm.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/realm/jdbcRealm.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/jndiRealm.jsp apache-tomcat-5.5.27-src/container/webapps/admin/realm/jndiRealm.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/jndiRealm.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/realm/jndiRealm.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/memoryRealm.jsp apache-tomcat-5.5.27-src/container/webapps/admin/realm/memoryRealm.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/memoryRealm.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/realm/memoryRealm.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/realms.jsp apache-tomcat-5.5.27-src/container/webapps/admin/realm/realms.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/realms.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/realm/realms.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/userDatabaseRealm.jsp apache-tomcat-5.5.27-src/container/webapps/admin/realm/userDatabaseRealm.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/realm/userDatabaseRealm.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/realm/userDatabaseRealm.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/dataSource.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/dataSource.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/dataSource.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/dataSource.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/deleteDataSources.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/deleteDataSources.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/deleteDataSources.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/deleteDataSources.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/deleteEnvEntries.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/deleteEnvEntries.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/deleteEnvEntries.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/deleteEnvEntries.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/deleteMailSessions.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/deleteMailSessions.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/deleteMailSessions.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/deleteMailSessions.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/deleteResourceLinks.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/deleteResourceLinks.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/deleteResourceLinks.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/deleteResourceLinks.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/deleteUserDatabases.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/deleteUserDatabases.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/deleteUserDatabases.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/deleteUserDatabases.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/envEntry.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/envEntry.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/envEntry.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/envEntry.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/listDataSources.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/listDataSources.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/listDataSources.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/listDataSources.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/listEnvEntries.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/listEnvEntries.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/listEnvEntries.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/listEnvEntries.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/listMailSessions.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/listMailSessions.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/listMailSessions.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/listMailSessions.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/listResourceLinks.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/listResourceLinks.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/listResourceLinks.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/listResourceLinks.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/listUserDatabases.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/listUserDatabases.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/listUserDatabases.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/listUserDatabases.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/mailSession.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/mailSession.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/mailSession.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/mailSession.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/resourceLink.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/resourceLink.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/resourceLink.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/resourceLink.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/userDatabase.jsp apache-tomcat-5.5.27-src/container/webapps/admin/resources/userDatabase.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/resources/userDatabase.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/resources/userDatabase.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/saved.jsp apache-tomcat-5.5.27-src/container/webapps/admin/saved.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/saved.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/saved.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <body bgcolor="white" background="images/PaperTexture.gif">
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/savefail.jsp apache-tomcat-5.5.27-src/container/webapps/admin/savefail.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/savefail.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/savefail.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <body bgcolor="white" background="images/PaperTexture.gif">
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/server/server.jsp apache-tomcat-5.5.27-src/container/webapps/admin/server/server.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/server/server.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/server/server.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/service/service.jsp apache-tomcat-5.5.27-src/container/webapps/admin/service/service.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/service/service.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/service/service.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/service/services.jsp apache-tomcat-5.5.27-src/container/webapps/admin/service/services.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/service/services.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/service/services.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/tree-control-test.jsp apache-tomcat-5.5.27-src/container/webapps/admin/tree-control-test.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/tree-control-test.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/tree-control-test.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <!-- Standard Content -->
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/deleteGroups.jsp apache-tomcat-5.5.27-src/container/webapps/admin/users/deleteGroups.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/deleteGroups.jsp 2008-08-29 05:14:01.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/users/deleteGroups.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/deleteRoles.jsp apache-tomcat-5.5.27-src/container/webapps/admin/users/deleteRoles.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/deleteRoles.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/users/deleteRoles.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/deleteUsers.jsp apache-tomcat-5.5.27-src/container/webapps/admin/users/deleteUsers.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/deleteUsers.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/users/deleteUsers.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/group.jsp apache-tomcat-5.5.27-src/container/webapps/admin/users/group.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/group.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/users/group.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/listGroups.jsp apache-tomcat-5.5.27-src/container/webapps/admin/users/listGroups.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/listGroups.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/users/listGroups.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/listRoles.jsp apache-tomcat-5.5.27-src/container/webapps/admin/users/listRoles.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/listRoles.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/users/listRoles.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/listUsers.jsp apache-tomcat-5.5.27-src/container/webapps/admin/users/listUsers.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/listUsers.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/users/listUsers.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/role.jsp apache-tomcat-5.5.27-src/container/webapps/admin/users/role.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/role.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/users/role.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/user.jsp apache-tomcat-5.5.27-src/container/webapps/admin/users/user.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/users/user.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/users/user.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -22,7 +22,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/accessLogValve.jsp apache-tomcat-5.5.27-src/container/webapps/admin/valve/accessLogValve.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/accessLogValve.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/valve/accessLogValve.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/remoteAddrValve.jsp apache-tomcat-5.5.27-src/container/webapps/admin/valve/remoteAddrValve.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/remoteAddrValve.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/valve/remoteAddrValve.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/remoteHostValve.jsp apache-tomcat-5.5.27-src/container/webapps/admin/valve/remoteHostValve.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/remoteHostValve.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/valve/remoteHostValve.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/requestDumperValve.jsp apache-tomcat-5.5.27-src/container/webapps/admin/valve/requestDumperValve.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/requestDumperValve.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/valve/requestDumperValve.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/singleSignOnValve.jsp apache-tomcat-5.5.27-src/container/webapps/admin/valve/singleSignOnValve.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/singleSignOnValve.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/valve/singleSignOnValve.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
-diff -Naur apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/valves.jsp apache-tomcat-5.5.27-src/container/webapps/admin/valve/valves.jsp
---- apache-tomcat-5.5.27-src.orig/container/webapps/admin/valve/valves.jsp 2008-08-29 05:14:02.000000000 +0200
-+++ apache-tomcat-5.5.27-src/container/webapps/admin/valve/valves.jsp 2009-01-22 12:29:45.000000000 +0100
-@@ -21,7 +21,7 @@
- <%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
-
--<html:html locale="true">
-+<html:html>
-
- <%@ include file="../users/header.jsp" %>
-
+++ /dev/null
-Index: container/catalina/src/share/org/apache/naming/resources/FileDirContext.java
-===================================================================
---- container/catalina/src/share/org/apache/naming/resources/FileDirContext.java (wersja 782756)
-+++ container/catalina/src/share/org/apache/naming/resources/FileDirContext.java (wersja 782757)
-@@ -37,6 +37,7 @@
- import javax.naming.directory.ModificationItem;
- import javax.naming.directory.SearchControls;
-
-+import org.apache.catalina.util.RequestUtil;
- import org.apache.naming.NamingContextBindingsEnumeration;
- import org.apache.naming.NamingContextEnumeration;
- import org.apache.naming.NamingEntry;
-@@ -773,50 +774,10 @@
- */
- protected String normalize(String path) {
-
-- String normalized = path;
-+ return RequestUtil.normalize(path, File.separatorChar == '\\');
-
-- // Normalize the slashes and add leading slash if necessary
-- if (File.separatorChar == '\\' && normalized.indexOf('\\') >= 0)
-- normalized = normalized.replace('\\', '/');
-- if (!normalized.startsWith("/"))
-- normalized = "/" + normalized;
--
-- // Resolve occurrences of "//" in the normalized path
-- while (true) {
-- int index = normalized.indexOf("//");
-- if (index < 0)
-- break;
-- normalized = normalized.substring(0, index) +
-- normalized.substring(index + 1);
- }
-
-- // Resolve occurrences of "/./" in the normalized path
-- while (true) {
-- int index = normalized.indexOf("/./");
-- if (index < 0)
-- break;
-- normalized = normalized.substring(0, index) +
-- normalized.substring(index + 2);
-- }
--
-- // Resolve occurrences of "/../" in the normalized path
-- while (true) {
-- int index = normalized.indexOf("/../");
-- if (index < 0)
-- break;
-- if (index == 0)
-- return (null); // Trying to go outside our context
-- int index2 = normalized.lastIndexOf('/', index - 1);
-- normalized = normalized.substring(0, index2) +
-- normalized.substring(index + 3);
-- }
--
-- // Return the normalized path that we have completed
-- return (normalized);
--
-- }
--
--
- /**
- * Return a File object representing the specified normalized
- * context-relative path if it exists and is readable. Otherwise,
-Index: container/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java (wersja 782756)
-+++ container/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java (wersja 782757)
-@@ -318,10 +318,9 @@
- int pos = requestPath.lastIndexOf('/');
- String relative = null;
- if (pos >= 0) {
-- relative = RequestUtil.normalize
-- (requestPath.substring(0, pos + 1) + path);
-+ relative = requestPath.substring(0, pos + 1) + path;
- } else {
-- relative = RequestUtil.normalize(requestPath + path);
-+ relative = requestPath + path;
- }
-
- return (context.getServletContext().getRequestDispatcher(relative));
-Index: container/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/core/ApplicationContext.java (wersja 782756)
-+++ container/catalina/src/share/org/apache/catalina/core/ApplicationContext.java (wersja 782757)
-@@ -43,6 +43,7 @@
- import org.apache.catalina.Wrapper;
- import org.apache.catalina.deploy.ApplicationParameter;
- import org.apache.catalina.util.Enumerator;
-+import org.apache.catalina.util.RequestUtil;
- import org.apache.catalina.util.ResourceSet;
- import org.apache.catalina.util.ServerInfo;
- import org.apache.catalina.util.StringManager;
-@@ -388,7 +389,7 @@
- path = path.substring(0, pos);
- }
-
-- path = normalize(path);
-+ path = RequestUtil.normalize(path);
- if (path == null)
- return (null);
-
-@@ -475,7 +476,7 @@
- throw new MalformedURLException(sm.getString("applicationContext.requestDispatcher.iae", path));
- }
-
-- path = normalize(path);
-+ path = RequestUtil.normalize(path);
- if (path == null)
- return (null);
-
-@@ -524,10 +525,13 @@
- */
- public InputStream getResourceAsStream(String path) {
-
-- path = normalize(path);
- if (path == null || !path.startsWith("/"))
- return (null);
-
-+ path = RequestUtil.normalize(path);
-+ if (path == null)
-+ return null;
-+
- DirContext resources = context.getResources();
- if (resources != null) {
- try {
-@@ -560,7 +564,7 @@
- (sm.getString("applicationContext.resourcePaths.iae", path));
- }
-
-- path = normalize(path);
-+ path = RequestUtil.normalize(path);
- if (path == null)
- return (null);
-
-@@ -870,45 +874,6 @@
-
-
- /**
-- * Return a context-relative path, beginning with a "/", that represents
-- * the canonical version of the specified path after ".." and "." elements
-- * are resolved out. If the specified path attempts to go outside the
-- * boundaries of the current context (i.e. too many ".." path elements
-- * are present), return <code>null</code> instead.
-- *
-- * @param path Path to be normalized
-- */
-- private String normalize(String path) {
--
-- if (path == null) {
-- return null;
-- }
--
-- String normalized = path;
--
-- // Normalize the slashes
-- if (normalized.indexOf('\\') >= 0)
-- normalized = normalized.replace('\\', '/');
--
-- // Resolve occurrences of "/../" in the normalized path
-- while (true) {
-- int index = normalized.indexOf("/../");
-- if (index < 0)
-- break;
-- if (index == 0)
-- return (null); // Trying to go outside our context
-- int index2 = normalized.lastIndexOf('/', index - 1);
-- normalized = normalized.substring(0, index2) +
-- normalized.substring(index + 3);
-- }
--
-- // Return the normalized path that we have completed
-- return (normalized);
--
-- }
--
--
-- /**
- * Merge the context initialization parameters specified in the application
- * deployment descriptor with the application parameters described in the
- * server configuration, respecting the <code>override</code> property of
-Index: container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java (wersja 782756)
-+++ container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java (wersja 782757)
-@@ -1369,76 +1369,6 @@
- resp.setStatus(WebdavStatus.SC_NO_CONTENT);
- }
-
-- /**
-- * Return a context-relative path, beginning with a "/", that represents
-- * the canonical version of the specified path after ".." and "." elements
-- * are resolved out. If the specified path attempts to go outside the
-- * boundaries of the current context (i.e. too many ".." path elements
-- * are present), return <code>null</code> instead.
-- *
-- * @param path Path to be normalized
-- */
-- protected String normalize(String path) {
-- if (path == null) {
-- return null;
-- }
--
-- // Create a place for the normalized path
-- String normalized = path;
--
-- if (normalized.equals("/.")) {
-- return "/";
-- }
--
-- // Normalize the slashes and add leading slash if necessary
-- if (normalized.indexOf('\\') >= 0) {
-- normalized = normalized.replace('\\', '/');
-- }
--
-- if (!normalized.startsWith("/")) {
-- normalized = "/" + normalized;
-- }
--
-- // Resolve occurrences of "//" in the normalized path
-- while (true) {
-- int index = normalized.indexOf("//");
-- if (index < 0) {
-- break;
-- }
-- normalized = normalized.substring(0, index) +
-- normalized.substring(index + 1);
-- }
--
-- // Resolve occurrences of "/./" in the normalized path
-- while (true) {
-- int index = normalized.indexOf("/./");
-- if (index < 0) {
-- break;
-- }
-- normalized = normalized.substring(0, index) +
-- normalized.substring(index + 2);
-- }
--
-- // Resolve occurrences of "/../" in the normalized path
-- while (true) {
-- int index = normalized.indexOf("/../");
-- if (index < 0) {
-- break;
-- }
-- if (index == 0) {
-- return (null); // Trying to go outside our context
-- }
--
-- int index2 = normalized.lastIndexOf('/', index - 1);
-- normalized = normalized.substring(0, index2) +
-- normalized.substring(index + 3);
-- }
--
-- // Return the normalized path that we have completed
-- return (normalized);
-- }
--
--
- // -------------------------------------------------------- Private Methods
-
- /**
-@@ -1589,7 +1519,7 @@
- }
-
- // Normalise destination path (remove '.' and '..')
-- destinationPath = normalize(destinationPath);
-+ destinationPath = RequestUtil.normalize(destinationPath);
-
- String contextPath = req.getContextPath();
- if ((contextPath != null) &&
-@@ -2347,7 +2277,8 @@
- if (!toAppend.startsWith("/"))
- toAppend = "/" + toAppend;
-
-- generatedXML.writeText(rewriteUrl(normalize(absoluteUri + toAppend)));
-+ generatedXML.writeText(rewriteUrl(RequestUtil.normalize(
-+ absoluteUri + toAppend)));
-
- generatedXML.writeElement(null, "href", XMLWriter.CLOSING);
-
-Index: container/catalina/src/share/org/apache/catalina/connector/Request.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/connector/Request.java (wersja 782756)
-+++ container/catalina/src/share/org/apache/catalina/connector/Request.java (wersja 782757)
-@@ -1243,10 +1243,9 @@
- int pos = requestPath.lastIndexOf('/');
- String relative = null;
- if (pos >= 0) {
-- relative = RequestUtil.normalize
-- (requestPath.substring(0, pos + 1) + path);
-+ relative = requestPath.substring(0, pos + 1) + path;
- } else {
-- relative = RequestUtil.normalize(requestPath + path);
-+ relative = requestPath + path;
- }
-
- return (context.getServletContext().getRequestDispatcher(relative));
-Index: container/catalina/src/share/org/apache/catalina/ssi/SSIServletRequestUtil.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/ssi/SSIServletRequestUtil.java (wersja 782756)
-+++ container/catalina/src/share/org/apache/catalina/ssi/SSIServletRequestUtil.java (wersja 782757)
-@@ -48,7 +48,7 @@
- if ((result == null) || (result.equals(""))) {
- result = "/";
- }
-- return normalize(result);
-+ return RequestUtil.normalize(result);
- }
-
-
-@@ -64,15 +64,9 @@
- *
- * @param path
- * Path to be normalized
-+ * @deprecated
- */
- public static String normalize(String path) {
-- if (path == null) return null;
-- String normalized = path;
-- //Why doesn't RequestUtil do this??
-- // Normalize the slashes and add leading slash if necessary
-- if (normalized.indexOf('\\') >= 0)
-- normalized = normalized.replace('\\', '/');
-- normalized = RequestUtil.normalize(path);
-- return normalized;
-+ return RequestUtil.normalize(path);
- }
- }
-\ No newline at end of file
-Index: container/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java (wersja 782756)
-+++ container/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java (wersja 782757)
-@@ -32,6 +32,7 @@
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
- import org.apache.catalina.connector.Request;
-+import org.apache.catalina.util.RequestUtil;
- import org.apache.coyote.Constants;
-
- /**
-@@ -373,7 +374,7 @@
- + pathWithoutContext);
- }
- String fullPath = prefix + path;
-- String retVal = SSIServletRequestUtil.normalize(fullPath);
-+ String retVal = RequestUtil.normalize(fullPath);
- if (retVal == null) {
- throw new IOException("Normalization yielded null on path: "
- + fullPath);
-@@ -406,7 +407,7 @@
- return new ServletContextAndPath(context,
- getAbsolutePath(virtualPath));
- } else {
-- String normalized = SSIServletRequestUtil.normalize(virtualPath);
-+ String normalized = RequestUtil.normalize(virtualPath);
- if (isVirtualWebappRelative) {
- return new ServletContextAndPath(context, normalized);
- } else {
-Index: container/catalina/src/share/org/apache/catalina/util/RequestUtil.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/util/RequestUtil.java (wersja 782756)
-+++ container/catalina/src/share/org/apache/catalina/util/RequestUtil.java (wersja 782757)
-@@ -147,13 +147,29 @@
- * @param path Relative path to be normalized
- */
- public static String normalize(String path) {
-+ return normalize(path, true);
-+ }
-
-+ /**
-+ * Normalize a relative URI path that may have relative values ("/./",
-+ * "/../", and so on ) it it. <strong>WARNING</strong> - This method is
-+ * useful only for normalizing application-generated paths. It does not
-+ * try to perform security checks for malicious input.
-+ *
-+ * @param path Relative path to be normalized
-+ * @param replaceBackSlash Should '\\' be replaced with '/'
-+ */
-+ public static String normalize(String path, boolean replaceBackSlash) {
-+
- if (path == null)
- return null;
-
- // Create a place for the normalized path
- String normalized = path;
-
-+ if (replaceBackSlash && normalized.indexOf('\\') >= 0)
-+ normalized = normalized.replace('\\', '/');
-+
- if (normalized.equals("/."))
- return "/";
-
+++ /dev/null
-Index: connectors/jk/java/org/apache/jk/common/ChannelSocket.java
-===================================================================
---- connectors/jk/java/org/apache/jk/common/ChannelSocket.java (wersja 781361)
-+++ connectors/jk/java/org/apache/jk/common/ChannelSocket.java (wersja 781362)
-@@ -46,6 +46,7 @@
- import org.apache.coyote.Request;
- import org.apache.coyote.RequestGroupInfo;
- import org.apache.coyote.RequestInfo;
-+import org.apache.coyote.ActionCode;
- import org.apache.tomcat.util.threads.ThreadPool;
- import org.apache.tomcat.util.threads.ThreadPoolRunnable;
-
-@@ -703,6 +704,7 @@
- status= this.invoke( recv, ep );
- if( status!= JkHandler.OK ) {
- log.warn("processCallbacks status " + status );
-+ ep.action(ActionCode.ACTION_CLOSE, ep.getRequest().getResponse());
- break;
- }
- }
-Index: connectors/jk/java/org/apache/jk/common/HandlerRequest.java
-===================================================================
---- connectors/jk/java/org/apache/jk/common/HandlerRequest.java (wersja 781361)
-+++ connectors/jk/java/org/apache/jk/common/HandlerRequest.java (wersja 781362)
-@@ -265,8 +265,16 @@
- ((Request)ep.getRequest()).unparsedURI());
- }
- } catch( Exception ex ) {
-+ /* If we are here it is because we have a bad header or something like that */
- log.error( "Error decoding request ", ex );
- msg.dump( "Incomming message");
-+ Response res=ep.getRequest().getResponse();
-+ if ( res==null ) {
-+ res=new Response();
-+ ep.getRequest().setResponse(res);
-+ }
-+ res.setMessage("Bad Request");
-+ res.setStatus(400);
- return ERROR;
- }
-
-Index: connectors/jk/java/org/apache/jk/common/ChannelNioSocket.java
-===================================================================
---- connectors/jk/java/org/apache/jk/common/ChannelNioSocket.java (wersja 781361)
-+++ connectors/jk/java/org/apache/jk/common/ChannelNioSocket.java (wersja 781362)
-@@ -56,6 +56,7 @@
- import org.apache.coyote.Request;
- import org.apache.coyote.RequestGroupInfo;
- import org.apache.coyote.RequestInfo;
-+import org.apache.coyote.ActionCode;
- import org.apache.tomcat.util.threads.ThreadPool;
- import org.apache.tomcat.util.threads.ThreadPoolRunnable;
-
-@@ -854,6 +855,7 @@
- status= invoke( recv, ep );
- if( status != JkHandler.OK ) {
- log.warn("processCallbacks status " + status );
-+ ep.action(ActionCode.ACTION_CLOSE, ep.getRequest().getResponse());
- return false;
- }
- synchronized(this) {
+++ /dev/null
-Index: container/webapps/docs/changelog.xml
-===================================================================
---- container/webapps/docs/changelog.xml (wersja 781378)
-+++ container/webapps/docs/changelog.xml (wersja 781379)
-@@ -76,6 +76,11 @@
- logging at the context level but the security policy prevents this.
- (markt/rjung)
- </fix>
-+ <fix>
-+ Fix an information disclosure vulnerability in a number of the Realms
-+ that allowed user enumeration when using FORM authentication. This is
-+ CVE-2009-0580. (markt)
-+ </fix>
- </changelog>
- </subsection>
- <subsection name="Jasper">
-Index: container/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java (wersja 781378)
-+++ container/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java (wersja 781379)
-@@ -270,8 +270,9 @@
- */
- public Principal authenticate(String username, String credentials) {
-
-- // No user - can't possibly authenticate, don't bother the database then
-- if (username == null) {
-+ // No user or no credentials
-+ // Can't possibly authenticate, don't bother the database then
-+ if (username == null || credentials == null) {
- return null;
- }
-
-Index: container/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java (wersja 781378)
-+++ container/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java (wersja 781379)
-@@ -393,9 +393,10 @@
- String username,
- String credentials) {
-
-- // No user - can't possibly authenticate
-- if (username == null) {
-- return (null);
-+ // No user or no credentials
-+ // Can't possibly authenticate, don't bother the database then
-+ if (username == null || credentials == null) {
-+ return null;
- }
-
- // Look up the user's credentials
-Index: container/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java (wersja 781378)
-+++ container/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java (wersja 781379)
-@@ -147,7 +147,7 @@
- (GenericPrincipal) principals.get(username);
-
- boolean validated = false;
-- if (principal != null) {
-+ if (principal != null && credentials != null) {
- if (hasMessageDigest()) {
- // Hex hashes should be compared case-insensitive
- validated = (digest(credentials)
+++ /dev/null
-Index: container/webapps/docs/changelog.xml
-===================================================================
---- container/webapps/docs/changelog.xml (wersja 750927)
-+++ container/webapps/docs/changelog.xml (wersja 750928)
-@@ -31,6 +31,15 @@
- </properties>
-
- <body>
-+<section name="Tomcat 5.5.28 (fhanik)">
-+ <subsection name="webapps">
-+ <changelog>
-+ <fix>
-+ Fix CVE-2009-0781. XSS in calendar example. (markt)
-+ </fix>
-+ </changelog>
-+ </subsection>
-+</section>
- <section name="Tomcat 5.5.27 (fhanik)">
- <subsection name="General">
- <changelog>
+++ /dev/null
-Index: container/catalina/src/share/org/apache/catalina/core/StandardContext.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/core/StandardContext.java (wersja 781541)
-+++ container/catalina/src/share/org/apache/catalina/core/StandardContext.java (wersja 781542)
-@@ -4140,10 +4140,6 @@
- ((Lifecycle) pipeline).start();
- }
-
-- if(getProcessTlds()) {
-- processTlds();
-- }
--
- // Notify our interested LifecycleListeners
- lifecycle.fireLifecycleEvent(START_EVENT, null);
-
-@@ -4278,40 +4274,6 @@
- }
-
- /**
-- * Processes TLDs.
-- *
-- * @throws LifecycleException If an error occurs
-- */
-- protected void processTlds() throws LifecycleException {
-- TldConfig tldConfig = new TldConfig();
-- tldConfig.setContext(this);
--
-- // (1) check if the attribute has been defined
-- // on the context element.
-- tldConfig.setTldValidation(tldValidation);
-- tldConfig.setTldNamespaceAware(tldNamespaceAware);
--
-- // (2) if the attribute wasn't defined on the context
-- // try the host.
-- if (!tldValidation) {
-- tldConfig.setTldValidation
-- (((StandardHost) getParent()).getXmlValidation());
-- }
--
-- if (!tldNamespaceAware) {
-- tldConfig.setTldNamespaceAware
-- (((StandardHost) getParent()).getXmlNamespaceAware());
-- }
--
-- try {
-- tldConfig.execute();
-- } catch (Exception ex) {
-- log.error("Error reading tld listeners "
-- + ex.toString(), ex);
-- }
-- }
--
-- /**
- * Stop this Context component.
- *
- * @exception LifecycleException if a shutdown error occurs
-@@ -5083,6 +5045,10 @@
- return;
- }
- }
-+ if (processTlds) {
-+ this.addLifecycleListener(new TldConfig());
-+ }
-+
- super.init();
-
- // Notify our interested LifecycleListeners
-Index: container/catalina/src/share/org/apache/catalina/startup/TldConfig.java
-===================================================================
---- container/catalina/src/share/org/apache/catalina/startup/TldConfig.java (wersja 781541)
-+++ container/catalina/src/share/org/apache/catalina/startup/TldConfig.java (wersja 781542)
-@@ -49,20 +49,24 @@
-
- import org.apache.catalina.Context;
- import org.apache.catalina.Globals;
-+import org.apache.catalina.Lifecycle;
-+import org.apache.catalina.LifecycleEvent;
-+import org.apache.catalina.LifecycleListener;
- import org.apache.catalina.core.StandardContext;
-+import org.apache.catalina.core.StandardHost;
- import org.apache.catalina.util.StringManager;
- import org.apache.tomcat.util.digester.Digester;
- import org.xml.sax.InputSource;
-
- /**
-- * Startup event listener for a <b>Context</b> that configures the properties
-- * of that Context, and the associated defined servlets.
-+ * Startup event listener for a <b>Context</b> that configures application
-+ * listeners configured in any TLD files.
- *
- * @author Craig R. McClanahan
- * @author Jean-Francois Arcand
- * @author Costin Manolache
- */
--public final class TldConfig {
-+public final class TldConfig implements LifecycleListener {
-
- // Names of JARs that are known not to contain any TLDs
- private static HashSet noTldJars;
-@@ -399,20 +403,6 @@
- }
-
- /**
-- * Create (if necessary) and return a Digester configured to process a tag
-- * library descriptor, looking for additional listener classes to be
-- * registered.
-- */
-- private static Digester createTldDigester() {
--
-- return DigesterFactory.newDigester(tldValidation,
-- tldNamespaceAware,
-- new TldRuleSet());
--
-- }
--
--
-- /**
- * Scan the JAR file at the specified resource path for TLDs in the
- * <code>META-INF</code> subdirectory, and scan each TLD for application
- * event listeners that need to be registered.
-@@ -504,10 +494,6 @@
- private void tldScanStream(InputSource resourceStream)
- throws Exception {
-
-- if (tldDigester == null){
-- tldDigester = createTldDigester();
-- }
--
- synchronized (tldDigester) {
- try {
- tldDigester.push(this);
-@@ -726,4 +712,51 @@
-
- return jarPathMap;
- }
-+
-+ public void lifecycleEvent(LifecycleEvent event) {
-+ // Identify the context we are associated with
-+ try {
-+ context = (Context) event.getLifecycle();
-+ } catch (ClassCastException e) {
-+ log.error(sm.getString("tldConfig.cce", event.getLifecycle()), e);
-+ return;
-+ }
-+
-+ if (event.getType().equals(Lifecycle.INIT_EVENT)) {
-+ init();
-+ } else if (event.getType().equals(Lifecycle.START_EVENT)) {
-+ try {
-+ execute();
-+ } catch (Exception e) {
-+ log.error(sm.getString(
-+ "tldConfig.execute", context.getPath()), e);
-+ }
-+ } // Ignore the other event types - nothing to do
-+ }
-+
-+ private void init() {
-+ if (tldDigester == null){
-+ // (1) check if the attribute has been defined
-+ // on the context element.
-+ setTldValidation(context.getTldValidation());
-+ setTldNamespaceAware(context.getTldNamespaceAware());
-+
-+ // (2) if the attribute wasn't defined on the context
-+ // try the host.
-+ if (!tldValidation) {
-+ setTldValidation(
-+ ((StandardHost) context.getParent()).getXmlValidation());
-+ }
-+
-+ if (!tldNamespaceAware) {
-+ setTldNamespaceAware(
-+ ((StandardHost) context.getParent()).getXmlNamespaceAware());
-+ }
-+
-+ tldDigester = DigesterFactory.newDigester(tldValidation,
-+ tldNamespaceAware,
-+ new TldRuleSet());
-+ tldDigester.getParser();
-+ }
-+ }
- }
-Index: container/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
-===================================================================
---- container/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties (wersja 781541)
-+++ container/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties (wersja 781542)
-@@ -87,6 +87,8 @@
- hostConfig.undeploy=Undeploying context [{0}]
- hostConfig.undeploy.error=Error undeploying web application at context path {0}
- hostConfig.undeploying=Undeploying deployed web applications
-+tldConfig.cce=Lifecycle event data object {0} is not a Context
-+tldConfig.execute=Error processing TLD files for context path {0}
- userConfig.database=Exception loading user database
- userConfig.deploy=Deploying web application for user {0}
- userConfig.deploying=Deploying user web applications
projects / packages / tomcat.git / commitdiff