Author: markt
Date: Wed May 18 12:35:40 2011
New Revision: 1124220
URL: http://svn.apache.org/viewvc?rev=1124220&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51147
Fix deploy for HTML Manager app that was broken when CSRF prevention was added
Patch provided by Alexis Hassler.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1124220&r1=1124219&r2=1124220&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed May 18 12:35:40 2011
@@ -178,13 +178,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51147
- Fix deploy for HTML Manager app that was broken when CSRF prevention was
added
- Patch provided by Alexis Hassler.
- https://issues.apache.org/bugzilla/attachment.cgi?id=26957&action=diff
- +1: markt, kkolinko, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51119
Add JAAS authentication support to the JmxRemoteLifecycleListener
Patch provided by Neil Laurance
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1124220&r1=1124219&r2=1124220&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Wed May 18 12:35:40 2011
@@ -1114,7 +1114,7 @@ public final class HTMLManagerServlet ex
"</tr>\n" +
"<tr>\n" +
" <td colspan=\"2\">\n" +
- "<form method=\"get\" action=\"{2}\">\n" +
+ "<form method=\"post\" action=\"{2}\">\n" +
"<table cellspacing=\"0\" cellpadding=\"3\">\n" +
"<tr>\n" +
" <td class=\"row-right\">\n" +
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1124220&r1=1124219&r2=1124220&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed May 18 12:35:40 2011
@@ -152,6 +152,10 @@
than maintaining a copy of its content. (kkolinko)
</update>
<fix>
+ <bug>51147</bug>: Fix deployment via HTML Manager that was broken by
+ addition of CRSF protection. Patch provided by Alexis Hassler. (markt)
+ </fix>
+ <fix>
<bug>51156</bug>: Ensure session expiration option is available in
Manager application was running web applications that were defined in
server.xml. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
