remm 02/03/23 09:35:12
Modified: catalina/src/share/org/apache/catalina/connector
HttpRequestBase.java
Log:
- Port fix for 6846 (after testing with Watchdog).
Revision Changes Path
1.36 +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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- HttpRequestBase.java 20 Mar 2002 23:10:00 -0000 1.35
+++ HttpRequestBase.java 23 Mar 2002 17:35:11 -0000 1.36
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
1.35 2002/03/20 23:10:00 remm Exp $
- * $Revision: 1.35 $
- * $Date: 2002/03/20 23:10:00 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
1.36 2002/03/23 17:35:11 remm Exp $
+ * $Revision: 1.36 $
+ * $Date: 2002/03/23 17:35:11 $
*
* ====================================================================
*
@@ -102,7 +102,7 @@
* be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.35 $ $Date: 2002/03/20 23:10:00 $
+ * @version $Revision: 1.36 $ $Date: 2002/03/23 17:35:11 $
* @deprecated
*/
@@ -759,7 +759,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]>
