Author: kkolinko
Date: Wed Mar 3 17:24:52 2010
New Revision: 918592
URL: http://svn.apache.org/viewvc?rev=918592&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48577
Filter URL when displaying missing included page (markt)
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918592&r1=918591&r2=918592&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 3 17:24:52 2010
@@ -146,13 +146,6 @@
+1: markt, kkolinko, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48577
- Filter URL when displaying missing included page
- Patch by markt
- http://svn.apache.org/viewvc?rev=905735&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48179
Improve processing of TLD cache file
https://issues.apache.org/bugzilla/attachment.cgi?id=24918
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?rev=918592&r1=918591&r2=918592&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Wed Mar 3 17:24:52 2010
@@ -771,9 +771,9 @@
// to be ignored by the resource that is including us.
// Therefore, the only way we can let the including resource
// know is by including warning message in response
- response.getWriter().write(
+ response.getWriter().write(RequestUtil.filter(
sm.getString("defaultServlet.missingResource",
- requestUri));
+ requestUri)));
}
response.sendError(HttpServletResponse.SC_NOT_FOUND,
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=918592&r1=918591&r2=918592&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar 3
17:24:52 2010
@@ -125,6 +125,10 @@
exist. Patch provided by Kevin Conaway. (markt)
</fix>
<fix>
+ <bug>48577</bug>: Filter URL when displaying missing included page.
+ (markt)
+ </fix>
+ <fix>
Add an additional permission required by JULI when running under newer
JDKs and a security manager. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
