You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ru...@locus.apache.org on 2000/02/27 04:23:36 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/servlets DefaultServlet.java
rubys 00/02/26 19:23:36
Modified: src/share/org/apache/tomcat/core Context.java
src/share/org/apache/tomcat/servlets DefaultServlet.java
Log:
respect context home
Revision Changes Path
1.63 +4 -0 jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java
Index: Context.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Context.java 2000/02/24 23:01:27 1.62
+++ Context.java 2000/02/27 03:23:34 1.63
@@ -698,6 +698,10 @@
String realPath= this.getDocBase() + mappedPath;
+ // evaluate relative paths relative to the context's home
+ if (!(new File(realPath).isAbsolute()))
+ realPath = contextM.getHome() + "/" + realPath;
+
// Probably not needed - it will be used on the local FS
realPath = FileUtil.patch(realPath);
1.8 +4 -0 jakarta-tomcat/src/share/org/apache/tomcat/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/servlets/DefaultServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultServlet.java 2000/02/16 17:46:58 1.7
+++ DefaultServlet.java 2000/02/27 03:23:35 1.8
@@ -93,6 +93,10 @@
docBase += "/";
}
+ // ensure docBase relative to home
+ if (!(new File(docBase)).isAbsolute())
+ docBase = context.getContextManager().getHome() + "/" + docBase;
+
// debug
String dbg=getServletConfig().getInitParameter("debug");
if( dbg!=null) debug=1;