markt 2005/06/27 14:54:35
Modified: catalina/src/share/org/apache/naming/resources
FileDirContext.java
webapps/docs changelog.xml
Log:
DefaultServlet was showing symbolic links in directory listings with
- no last modified date for files or dirs
- no size for files
- files were displayed as directories.
Revision Changes Path
1.9 +5 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/FileDirContext.java
Index: FileDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileDirContext.java 20 Apr 2005 16:13:23 -0000 1.8
+++ FileDirContext.java 27 Jun 2005 21:54:35 -0000 1.9
@@ -216,6 +216,8 @@
if (file.isDirectory()) {
FileDirContext tempContext = new FileDirContext(env);
tempContext.setDocBase(file.getPath());
+ tempContext.setAllowLinking(getAllowLinking());
+ tempContext.setCaseSensitive(isCaseSensitive());
result = tempContext;
} else {
result = new FileResource(file);
@@ -903,6 +905,8 @@
if (currentFile.isDirectory()) {
FileDirContext tempContext = new FileDirContext(env);
tempContext.setDocBase(file.getPath());
+ tempContext.setAllowLinking(getAllowLinking());
+ tempContext.setCaseSensitive(isCaseSensitive());
object = tempContext;
} else {
object = new FileResource(currentFile);
1.318 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- changelog.xml 26 Jun 2005 21:23:35 -0000 1.317
+++ changelog.xml 27 Jun 2005 21:54:35 -0000 1.318
@@ -170,6 +170,10 @@
<bug>34840</bug>: Better handling of external WARs redeployment, and
ignore docBase specified
in context file if within the Host appBase (remm)
</fix>
+ <fix>
+ Fix handling of symbolic links when the DefaultServlet is generating
directory
+ listings.
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
