Author: remy.maucherat(a)jboss.com Date: 2008-09-18 11:57:52 -0400 (Thu, 18 Sep 2008) New Revision: 783 Modified: trunk/java/org/apache/catalina/servlets/DefaultServlet.java trunk/webapps/docs/changelog.xml trunk/webapps/docs/default-servlet.xml Log: - Add advertise accept ranges. Acro Reader (at least some versions of it) need that supposedly, although it is optional. Modified: trunk/java/org/apache/catalina/servlets/DefaultServlet.java =================================================================== --- trunk/java/org/apache/catalina/servlets/DefaultServlet.java 2008-09-17 15:56:37 UTC (rev 782) +++ trunk/java/org/apache/catalina/servlets/DefaultServlet.java 2008-09-18 15:57:52 UTC (rev 783) @@ -156,6 +156,12 @@ /** + * Should the Accept-Ranges: bytes header be send with static resources? + */ + protected boolean useAcceptRanges = true; + + + /** * Full range marker. */ protected static ArrayList FULL = new ArrayList(); @@ -241,6 +247,9 @@ localXsltFile = getServletConfig().getInitParameter("localXsltFile"); readmeFile = getServletConfig().getInitParameter("readmeFile"); + if (getServletConfig().getInitParameter("useAcceptRanges") != null) + useAcceptRanges = Boolean.parseBoolean(getServletConfig().getInitParameter("useAcceptRanges")); + // Sanity check on the specified buffer sizes if (input < 256) input = 256; @@ -718,6 +727,11 @@ } else { + if (useAcceptRanges) { + // Accept ranges header + response.setHeader("Accept-Ranges", "bytes"); + } + // Parse range specifier ranges = parseRange(request, response, cacheEntry.attributes); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-09-17 15:56:37 UTC (rev 782) +++ trunk/webapps/docs/changelog.xml 2008-09-18 15:57:52 UTC (rev 783) @@ -28,6 +28,9 @@ <fix> <bug>45441</bug>: Correctly map filters for FORWARD and INCLUDE. (remm) </fix> + <fix> + <bug>45419</bug>: Set Accept-Ranges for static resources served by DefaultServlet. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> Modified: trunk/webapps/docs/default-servlet.xml =================================================================== --- trunk/webapps/docs/default-servlet.xml 2008-09-17 15:56:37 UTC (rev 782) +++ trunk/webapps/docs/default-servlet.xml 2008-09-18 15:57:52 UTC (rev 783) @@ -144,6 +144,11 @@ to always disable sendfile. [48]</p> </attribute> + <attribute name="useAcceptRanges" required="false"> + <p>If true, the Accept-Ranges header will be set when appropriate for the + response. [true]</p> + </attribute> + </attributes> </section>