remm 2003/08/04 13:14:36
Modified: jasper2/src/share/org/apache/jasper/servlet JspServlet.java
Log:
- Fix including a JSP, where Jasper would do weird things whenever the
outer request had a non null pathInfo. now, it will use the included servlet
path correctly.
- This fixes bug 21206 (issue with Jetspeed).
Revision Changes Path
1.29 +10 -11
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServlet.java
Index: JspServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServlet.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- JspServlet.java 22 Jul 2003 21:04:46 -0000 1.28
+++ JspServlet.java 4 Aug 2003 20:14:36 -0000 1.29
@@ -202,18 +202,17 @@
if (includeUri == null) {
jspUri = request.getServletPath();
+ // When jsp-property-group/url-matching is used, and when the
+ // jsp is not defined with <servlet-name>, the url
+ // as to be passed as it is to the JSP container (since
+ // Catalina doesn't know anything about the requested JSP
+ if (request.getPathInfo() != null) {
+ jspUri = request.getServletPath() + request.getPathInfo();
+ }
} else {
jspUri = includeUri;
}
- // When jsp-property-group/url-matching is used, and when the
- // jsp is not defined with <servlet-name>, the url
- // as to be passed as it is to the JSP container (since Catalina
- // doesn't know anything about the requested JSP
- if(request.getPathInfo() != null){
- jspUri = request.getServletPath() + request.getPathInfo();
- }
-
String jspFile = (String) request.getAttribute(Constants.JSP_FILE);
if (jspFile != null) {
jspUri = jspFile;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
