remm 02/03/23 09:35:02
Modified: catalina/src/share/org/apache/catalina/connector Tag:
tomcat_40_branch HttpRequestBase.java
Log:
- Port fix for 6846 (after testing with Watchdog).
Revision Changes Path
No revision
No revision
1.31.2.2 +14 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java
Index: HttpRequestBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -u -r1.31.2.1 -r1.31.2.2
--- HttpRequestBase.java 22 Feb 2002 18:03:54 -0000 1.31.2.1
+++ HttpRequestBase.java 23 Mar 2002 17:35:02 -0000 1.31.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
1.31.2.1 2002/02/22 18:03:54 remm Exp $
- * $Revision: 1.31.2.1 $
- * $Date: 2002/02/22 18:03:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
1.31.2.2 2002/03/23 17:35:02 remm Exp $
+ * $Revision: 1.31.2.2 $
+ * $Date: 2002/03/23 17:35:02 $
*
* ====================================================================
*
@@ -102,7 +102,7 @@
* be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.31.2.1 $ $Date: 2002/02/22 18:03:54 $
+ * @version $Revision: 1.31.2.2 $ $Date: 2002/03/23 17:35:02 $
*/
public class HttpRequestBase
@@ -751,7 +751,16 @@
String servletPath = (String) getAttribute(Globals.SERVLET_PATH_ATTR);
if (servletPath == null)
servletPath = getServletPath();
- String relative = RequestUtil.normalize(servletPath + "/../" + path);
+
+ int pos = servletPath.lastIndexOf('/');
+ String relative = null;
+ if (pos > 0) {
+ relative = RequestUtil.normalize
+ (servletPath.substring(0, pos + 1) + path);
+ } else {
+ relative = RequestUtil.normalize(servletPath + path);
+ }
+
return (context.getServletContext().getRequestDispatcher(relative));
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
