tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1200117 - in /tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF: jsp/403.jsp web.xml
Date Thu, 10 Nov 2011 03:56:23 GMT
Author: kkolinko
Date: Thu Nov 10 03:56:23 2011
New Revision: 1200117

URL: http://svn.apache.org/viewvc?rev=1200117&view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
/webapps/host-manager

Modified:
    tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp
    tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/web.xml

Modified: tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp?rev=1200117&r1=1200116&r2=1200117&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp Thu Nov 10 03:56:23 2011
@@ -37,7 +37,7 @@
     and you have used your browsers back button, used a saved book-mark or
     similar then you may have triggered the cross-site request forgery (CSRF)
     protection that has been enabled for the HTML interface of the Host Manager
-    application. You will need to reset this protection by returning to the 
+    application. You will need to reset this protection by returning to the
     <a href="<%=request.getContextPath()%>/html">main Host Manager page</a>.
     Once you return to this page, you will be able to continue using the Host
     Manager appliction's HTML interface normally. If you continue to see this

Modified: tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/web.xml?rev=1200117&r1=1200116&r2=1200117&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/web.xml Thu Nov 10 03:56:23 2011
@@ -21,7 +21,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
                       http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
   version="3.0"
-  metadata-complete="true">  
+  metadata-complete="true">
 
   <display-name>Tomcat Host Manager Application</display-name>
   <description>
@@ -68,12 +68,12 @@
       <param-value>/html,/html/,/html/list,/index.jsp</param-value>
     </init-param>
   </filter>
-  
+
   <filter-mapping>
     <filter-name>CSRF</filter-name>
     <servlet-name>HTMLHostManager</servlet-name>
   </filter-mapping>
-  
+
   <!-- Define the Manager Servlet Mapping -->
   <servlet-mapping>
     <servlet-name>HostManager</servlet-name>
@@ -140,5 +140,5 @@
     <error-code>404</error-code>
     <location>/WEB-INF/jsp/404.jsp</location>
   </error-page>
-  
+
 </web-app>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message