tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r332159 - in /tomcat/container/branches/tc4.1.x/catalina/src: conf/web.xml share/org/apache/catalina/servlets/DefaultServlet.java
Date Wed, 09 Nov 2005 22:14:39 GMT
Author: markt
Date: Wed Nov  9 14:14:33 2005
New Revision: 332159

URL: http://svn.apache.org/viewcvs?rev=332159&view=rev
Log:
Port of fix for Bug37150 to TC4.

Modified:
    tomcat/container/branches/tc4.1.x/catalina/src/conf/web.xml
    tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java

Modified: tomcat/container/branches/tc4.1.x/catalina/src/conf/web.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/conf/web.xml?rev=332159&r1=332158&r2=332159&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/conf/web.xml (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/conf/web.xml Wed Nov  9 14:14:33 2005
@@ -34,7 +34,10 @@
   <!--                       resources to be served.  [2048]                -->
   <!--                                                                      -->
   <!--   listings            Should directory listings be produced if there -->
-  <!--                       is no welcome file in this directory?  [true]  -->
+  <!--                       is no welcome file in this directory?  [false] -->
+  <!--                       WARNING: Listings for directories with many    -->
+  <!--                       entries can be slow and may consume            -->
+  <!--                       significant proportions of server resources.   -->
   <!--                                                                      -->
   <!--   output              Output buffer size (in bytes) when writing     -->
   <!--                       resources to be served.  [2048]                -->
@@ -57,7 +60,7 @@
         </init-param>
         <init-param>
             <param-name>listings</param-name>
-            <param-value>true</param-value>
+            <param-value>false</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>

Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?rev=332159&r1=332158&r2=332159&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Wed Nov  9 14:14:33 2005
@@ -93,7 +93,7 @@
     /**
      * Should we generate directory listings when no welcome file is present?
      */
-    protected boolean listings = true;
+    protected boolean listings = false;
 
 
     /**
@@ -552,9 +552,6 @@
         File contentFile = null;
 
         // Input stream for temp. content file used to support partial PUT
-        FileInputStream contentFileInStream = null;
-
-        ResourceInfo resourceInfo = new ResourceInfo(path, resources);
         Range range = parseContentRange(req, resp);
 
         InputStream resourceInputStream = null;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message