Author: markt
Date: Thu Oct 4 16:30:50 2012
New Revision: 1394144
URL: http://svn.apache.org/viewvc?rev=1394144&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53793
Change links on the list of applications in the Manager to point to '/appname/'
instead of '/appname'.
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=1394144&r1=1394143&r2=1394144&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 4 16:30:50 2012
@@ -89,13 +89,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: schultz, kkolinko, jfclere
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53793
- Change links on the list of applications in the Manager to point to
- '/appname/' instead of '/appname'.
- https://issues.apache.org/bugzilla/attachment.cgi?id=29296
- +1: kkolinko, kfujino, schultz, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53800
FileDirContext.list() did not provide correct paths for subdirectories.
Patch provided by Kevin Wooten.
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=1394144&r1=1394143&r2=1394144&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
Thu Oct 4 16:30:50 2012
@@ -406,7 +406,7 @@ public final class HTMLManagerServlet ex
}
args = new Object[7];
- args[0] = URL_ENCODER.encode(displayPath);
+ args[0] = URL_ENCODER.encode(contextPath + "/");
args[1] = RequestUtil.filter(displayPath);
if (context.getDisplayName() == null) {
args[2] = " ";
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=1394144&r1=1394143&r2=1394144&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 4 16:30:50 2012
@@ -378,6 +378,11 @@
<bug>53601</bug>: Clarify that to build Apache Tomcat 6 from sources
a Java 5 JDK is recommended. (kkolinko)
</fix>
+ <fix>
+ <bug>53793</bug>: Change links on the list of applications in the
+ Manager to point to <code>/appname/</code> instead of
+ <code>/appname</code>. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
