Author: markt
Date: Sun Nov 19 16:17:55 2006
New Revision: 476992
URL: http://svn.apache.org/viewvc?view=rev&rev=476992
Log:
Port fix for bug 40901. Encode directory listing output. Based on a patch by
Chris Halstead.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?view=diff&rev=476992&r1=476991&r2=476992
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Sun Nov 19 16:17:55 2006
@@ -56,6 +56,7 @@
import javax.xml.transform.stream.StreamSource;
import org.apache.catalina.Globals;
+import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.util.URLEncoder;
@@ -1171,7 +1172,7 @@
.append("'");
sb.append(">");
- sb.append(trimmed);
+ sb.append(RequestUtil.filter(trimmed));
if (childCacheEntry.context != null)
sb.append("/");
sb.append("</entry>");
@@ -1333,7 +1334,7 @@
if (childCacheEntry.context != null)
sb.append("/");
sb.append("\"><tt>");
- sb.append(trimmed);
+ sb.append(RequestUtil.filter(trimmed));
if (childCacheEntry.context != null)
sb.append("/");
sb.append("</tt></a></td>\r\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?view=diff&rev=476992&r1=476991&r2=476992
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 19 16:17:55 2006
@@ -28,6 +28,10 @@
<fix>
<bug>40844</bug> Missing syncs in JDBCRealm. (markt)
</fix>
+ <fix>
+ <bug>40901</bug>: Encode directory listing output. Based on a patch
+ provided by Chris Halstead. (markt)
+ </fix>
<fix>
<bug>40929</bug>: Correct JavaDoc for StandardClassLoader. (markt)
(markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
