Author: markt
Date: Fri Nov 10 13:16:56 2006
New Revision: 473488
URL: http://svn.apache.org/viewvc?view=rev&rev=473488
Log:
Fix bug 40901. Encode directory listing output. Based on a patch by Chris
Halstead.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?view=diff&rev=473488&r1=473487&r2=473488
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Fri Nov 10 13:16:56 2006
@@ -55,6 +55,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;
@@ -1207,7 +1208,7 @@
.append("'");
sb.append(">");
- sb.append(trimmed);
+ sb.append(RequestUtil.filter(trimmed));
if (childCacheEntry.context != null)
sb.append("/");
sb.append("</entry>");
@@ -1376,7 +1377,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/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=473488&r1=473487&r2=473488
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Nov 10 13:16:56 2006
@@ -112,8 +112,11 @@
(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 StandardCalssLoader. (markt)
- (markt)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
