Author: markt
Date: Fri Sep 19 04:09:15 2008
New Revision: 697051
URL: http://svn.apache.org/viewvc?rev=697051&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45441
Correctly map filters for FORWARD and INCLUDE
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.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=697051&r1=697050&r2=697051&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 19 04:09:15 2008
@@ -153,12 +153,6 @@
look into them as separate issues.
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45441
- Correctly map filters for FORWARD and INCLUDE
- http://svn.apache.org/viewvc?rev=696240&view=rev
- +1: markt, remm, pero
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427
Correct parsing of quoted stings in EL
http://svn.apache.org/viewvc?rev=696278&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=697051&r1=697050&r2=697051&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Fri Sep 19 04:09:15 2008
@@ -429,7 +429,7 @@
if (disInt.intValue() != ApplicationFilterFactory.ERROR) {
state.outerRequest.setAttribute
(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
- servletPath);
+ getCombinedPath());
state.outerRequest.setAttribute
(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
Integer.valueOf(ApplicationFilterFactory.FORWARD));
@@ -442,7 +442,23 @@
}
-
+ /**
+ * Combine the servletPath and the pathInfo. If pathInfo is
+ * <code>null</code> it is ignored. If servletPath is <code>null</code>
then
+ * <code>null</code> is returned.
+ * @return The combined path with pathInfo appended to servletInfo
+ */
+ private String getCombinedPath() {
+ if (servletPath == null) {
+ return null;
+ }
+ if (pathInfo == null) {
+ return servletPath;
+ }
+ return servletPath + pathInfo;
+ }
+
+
/**
* Include the response from another resource in the current response.
* Any runtime exception, IOException, or ServletException thrown by the
@@ -499,7 +515,7 @@
Integer.valueOf(ApplicationFilterFactory.INCLUDE));
wrequest.setAttribute(
ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
- servletPath);
+ getCombinedPath());
invoke(state.outerRequest, state.outerResponse, state);
}
@@ -531,7 +547,7 @@
Integer.valueOf(ApplicationFilterFactory.INCLUDE));
wrequest.setAttribute(
ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
- servletPath);
+ getCombinedPath());
invoke(state.outerRequest, state.outerResponse, state);
}
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=697051&r1=697050&r2=697051&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 19 04:09:15 2008
@@ -44,6 +44,9 @@
<bug>41407</bug>: Add CLIENT-CERT support to the JAAS Realm. (markt)
</add>
<fix>
+ <bug>45441</bug>: Correctly map filters for FORWARD and INCLUDE.
(markt)
+ </fix>
+ <fix>
<bug>45453</bug>: Remove potential race condition in JDBC Realm.
Based on a patch by Santtu Hyrkk. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
