tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r332143 - in /tomcat/container/branches/tc5.0.x: catalina/src/conf/web.xml catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/default-servlet.xml
Date Wed, 09 Nov 2005 21:16:45 GMT
Author: markt
Date: Wed Nov  9 13:16:40 2005
New Revision: 332143

URL: http://svn.apache.org/viewcvs?rev=332143&view=rev
Log:
Port fix for 37150 to 5.0 branch in case there is another 5.0 release.

Modified:
    tomcat/container/branches/tc5.0.x/catalina/src/conf/web.xml
    tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
    tomcat/container/branches/tc5.0.x/webapps/docs/default-servlet.xml

Modified: tomcat/container/branches/tc5.0.x/catalina/src/conf/web.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc5.0.x/catalina/src/conf/web.xml?rev=332143&r1=332142&r2=332143&view=diff
==============================================================================
--- tomcat/container/branches/tc5.0.x/catalina/src/conf/web.xml (original)
+++ tomcat/container/branches/tc5.0.x/catalina/src/conf/web.xml Wed Nov  9 13:16:40 2005
@@ -31,7 +31,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]                -->
@@ -68,7 +71,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/tc5.0.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?rev=332143&r1=332142&r2=332143&view=diff
==============================================================================
--- tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Wed Nov  9 13:16:40 2005
@@ -98,7 +98,7 @@
     /**
      * Should we generate directory listings?
      */
-    protected boolean listings = true;
+    protected boolean listings = false;
 
 
     /**

Modified: tomcat/container/branches/tc5.0.x/webapps/docs/default-servlet.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc5.0.x/webapps/docs/default-servlet.xml?rev=332143&r1=332142&r2=332143&view=diff
==============================================================================
--- tomcat/container/branches/tc5.0.x/webapps/docs/default-servlet.xml (original)
+++ tomcat/container/branches/tc5.0.x/webapps/docs/default-servlet.xml Wed Nov  9 13:16:40
2005
@@ -89,6 +89,10 @@
         value may be <b>true</b> or <b>false</b>
         <br />
         Welcome files are part of the servlet api.
+        <br />
+        <b>WARNING:</b> Listings of directories containing many entries are
+        expensive. Multiple requests for large directory listings can consume
+        significant proportions of server resources.
     </td>
   </tr>
   <tr>



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


Mime
View raw message