Subject: svn commit: r697053 - in /tomcat/tc6.0.x/trunk: STATUS.txt conf/web.xml java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml webapps/docs/default-servlet.xml From: markt@apache.org Date: Fri, 19 Sep 2008 11:12:13 +0000 To: dev@tomcat.apache.org Author: markt Date: Fri Sep 19 04:12:13 2008 New Revision: 697053 URL: http://svn.apache.org/viewvc?rev=697053&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45419 Set Accept-Ranges for static resources served by DefaultServlet Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/conf/web.xml tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/default-servlet.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=697053&r1=697052&r2=697053&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 19 04:12:13 2008 @@ -159,12 +159,6 @@ +1: markt, remm -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45419 - Set Accept-Ranges for static resources served by DefaultServlet - http://svn.apache.org/viewvc?rev=696408&view=rev - +1: markt, remm, pero - -1: - * Allow asynchronous close() and setTimeout() on CometEvents http://svn.apache.org/viewvc?view=rev&revision=645175 +1: fhanik Modified: tomcat/tc6.0.x/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?rev=697053&r1=697052&r2=697053&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/conf/web.xml (original) +++ tomcat/tc6.0.x/trunk/conf/web.xml Fri Sep 19 04:12:13 2008 @@ -70,6 +70,9 @@ + + + Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=697053&r1=697052&r2=697053&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Fri Sep 19 04:12:13 2008 @@ -154,7 +154,11 @@ */ protected int sendfileSize = 48 * 1024; - + /** + * Should the Accept-Ranges: bytes header be send with static resources? + */ + protected boolean useAcceptRanges = true; + /** * Full range marker. */ @@ -241,6 +245,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; @@ -717,9 +724,12 @@ contentType = "text/html;charset=UTF-8"; } else { + if (useAcceptRanges) { + // Accept ranges header + response.setHeader("Accept-Ranges", "bytes"); + } // Parse range specifier - ranges = parseRange(request, response, cacheEntry.attributes); // ETag header Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=697053&r1=697052&r2=697053&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 19 04:12:13 2008 @@ -44,6 +44,10 @@ 41407: Add CLIENT-CERT support to the JAAS Realm. (markt) + 45419: Set Accept-Ranges for static resources served by + DefaultServlet. (markt) + + 45441: Correctly map filters for FORWARD and INCLUDE. (markt) Modified: tomcat/tc6.0.x/trunk/webapps/docs/default-servlet.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/default-servlet.xml?rev=697053&r1=697052&r2=697053&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/default-servlet.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/default-servlet.xml Fri Sep 19 04:12:13 2008 @@ -179,6 +179,13 @@ to always disable sendfile. [48] + + useAcceptRanges + + If true, the Accept-Ranges header will be set when appropriate for the + response. [true] + + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org Subject: svn commit: r697051 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/ApplicationDispatcher.java webapps/docs/changelog.xml From: markt@apache.org Date: Fri, 19 Sep 2008 11:09:16 +0000 To: dev@tomcat.apache.org Author: markt Date: Fri Sep 19 04:09:15 2008 New Revision: 697051 URL: http://svn.apache.org/viewvc?rev=697051&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45441 Correctly map filters for FORWARD and INCLUDE Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=697051&r1=697050&r2=697051&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 19 04:09:15 2008 @@ -153,12 +153,6 @@ look into them as separate issues. -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45441 - Correctly map filters for FORWARD and INCLUDE - http://svn.apache.org/viewvc?rev=696240&view=rev - +1: markt, remm, pero - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427 Correct parsing of quoted stings in EL http://svn.apache.org/viewvc?rev=696278&view=rev Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=697051&r1=697050&r2=697051&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Fri Sep 19 04:09:15 2008 @@ -429,7 +429,7 @@ if (disInt.intValue() != ApplicationFilterFactory.ERROR) { state.outerRequest.setAttribute (ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, - servletPath); + getCombinedPath()); state.outerRequest.setAttribute (ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, Integer.valueOf(ApplicationFilterFactory.FORWARD)); @@ -442,7 +442,23 @@ } - + /** + * Combine the servletPath and the pathInfo. If pathInfo is + * null it is ignored. If servletPath is null then + * null is returned. + * @return The combined path with pathInfo appended to servletInfo + */ + private String getCombinedPath() { + if (servletPath == null) { + return null; + } + if (pathInfo == null) { + return servletPath; + } + return servletPath + pathInfo; + } + + /** * Include the response from another resource in the current response. * Any runtime exception, IOException, or ServletException thrown by the @@ -499,7 +515,7 @@ Integer.valueOf(ApplicationFilterFactory.INCLUDE)); wrequest.setAttribute( ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, - servletPath); + getCombinedPath()); invoke(state.outerRequest, state.outerResponse, state); } @@ -531,7 +547,7 @@ Integer.valueOf(ApplicationFilterFactory.INCLUDE)); wrequest.setAttribute( ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, - servletPath); + getCombinedPath()); invoke(state.outerRequest, state.outerResponse, state); } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=697051&r1=697050&r2=697051&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 19 04:09:15 2008 @@ -44,6 +44,9 @@ 41407: Add CLIENT-CERT support to the JAAS Realm. (markt) + 45441: Correctly map filters for FORWARD and INCLUDE. (markt) + + 45453: Remove potential race condition in JDBC Realm. Based on a patch by Santtu Hyrkk. (markt) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org Subject: svn commit: r697050 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/changelog.xml From: markt@apache.org Date: Fri, 19 Sep 2008 11:06:27 +0000 To: dev@tomcat.apache.org Author: markt Date: Fri Sep 19 04:06:26 2008 New Revision: 697050 URL: http://svn.apache.org/viewvc?rev=697050&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45823 Log missing request headers as - not null Based on a patch by Per Landberg Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=697050&r1=697049&r2=697050&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 19 04:06:26 2008 @@ -153,13 +153,6 @@ look into them as separate issues. -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45823 - Log missing request headers as - not null - Based on a patch by Per Landberg - http://svn.apache.org/viewvc?rev=696234&view=rev - +1: markt, remm, pero - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45441 Correctly map filters for FORWARD and INCLUDE http://svn.apache.org/viewvc?rev=696240&view=rev Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=697050&r1=697049&r2=697050&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java Fri Sep 19 04:06:26 2008 @@ -1238,7 +1238,12 @@ public void addElement(StringBuffer buf, Date date, Request request, Response response, long time) { - buf.append(request.getHeader(header)); + String value = request.getHeader(header); + if (value == null) { + buf.append('-'); + } else { + buf.append(value); + } } } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=697050&r1=697049&r2=697050&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 19 04:06:26 2008 @@ -66,6 +66,10 @@ 45785: Ignore directories named xxx.jar in WEB-INF/lib. (markt) + + 45823: Log missing request headers as '-' not 'null'. Based + on a patch by Per Landberg. (markt) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org Subject: svn commit: r697048 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/loader/WebappLoader.java java/org/apache/catalina/util/ExtensionValidator.java webapps/docs/changelog.xml From: markt@apache.org Date: Fri, 19 Sep 2008 10:59:38 +0000 To: dev@tomcat.apache.org Author: markt Date: Fri Sep 19 03:59:38 2008 New Revision: 697048 URL: http://svn.apache.org/viewvc?rev=697048&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45785 Ignore directories named xxx.jar in WEB-INF/lib Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=697048&r1=697047&r2=697048&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 19 03:59:38 2008 @@ -140,13 +140,6 @@ +1: jfclere, remm -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45785 - Ignore directories named xxx.jar in WEB-INF/lib - http://svn.apache.org/viewvc?rev=695274&view=rev - http://svn.apache.org/viewvc?rev=695284&view=rev - +1: markt, remm, pero - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45451 Don't unescape tag attribute values with EL twice Also fix numerous \${...} issues Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=697048&r1=697047&r2=697048&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java Fri Sep 19 03:59:38 2008 @@ -998,7 +998,13 @@ log.debug(sm.getString("webappLoader.jarDeploy", filename, destFile.getAbsolutePath())); - Resource jarResource = (Resource) binding.getObject(); + Object obj = binding.getObject(); + + if (!(obj instanceof Resource)) + continue; + + Resource jarResource = (Resource) obj; + if (copyJars) { if (!copy(jarResource.streamContent(), new FileOutputStream(destFile))) Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=697048&r1=697047&r2=697048&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java Fri Sep 19 03:59:38 2008 @@ -179,8 +179,13 @@ if (!binding.getName().toLowerCase().endsWith(".jar")) { continue; } - Resource resource = (Resource)dirContext.lookup - ("/WEB-INF/lib/" + binding.getName()); + Object obj = + dirContext.lookup("/WEB-INF/lib/" + binding.getName()); + if (!(obj instanceof Resource)) { + // Probably a directory named xxx.jar - ignore it + continue; + } + Resource resource = (Resource) obj; Manifest jmanifest = getManifest(resource.streamContent()); if (jmanifest != null) { ManifestResource mre = new ManifestResource( Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=697048&r1=697047&r2=697048&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 19 03:59:38 2008 @@ -62,6 +62,10 @@ Provide full stacktrace and message when the ErrorReportValveClass can't be instantiated. (funkman) + + 45785: Ignore directories named xxx.jar in WEB-INF/lib. + (markt) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org Subject: svn commit: r697042 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardHost.java webapps/docs/changelog.xml From: markt@apache.org Date: Fri, 19 Sep 2008 10:45:08 +0000 To: dev@tomcat.apache.org Author: markt Date: Fri Sep 19 03:45:07 2008 New Revision: 697042 URL: http://svn.apache.org/viewvc?rev=697042&view=rev Log: Provide full stacktrace/message when ErrorReportValveClass can't be instantiated. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=697042&r1=697041&r2=697042&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 19 03:45:07 2008 @@ -73,11 +73,6 @@ which to me means adding any sort of sync is not worth it. -1: -* http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?r1=593649&r2=685530&diff_format=h - Provide full stacktrace/message when ErrorReportValveClass can't be instantiated. - +1: funkman, remm, fhanik, pero - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43327 http://svn.apache.org/viewvc?rev=687755&view=rev Note use trunk >=r690600 of TC-native to test it as it also needs patches Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=697042&r1=697041&r2=697042&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Fri Sep 19 03:45:07 2008 @@ -707,7 +707,7 @@ } catch (Throwable t) { log.error(sm.getString ("standardHost.invalidErrorReportValveClass", - errorReportValveClass)); + errorReportValveClass), t); } } if(log.isDebugEnabled()) { Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=697042&r1=697041&r2=697042&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 19 03:45:07 2008 @@ -58,6 +58,10 @@ The JAAS Realm did not assign roles to authenticated users. (markt) + + Provide full stacktrace and message when the ErrorReportValveClass can't + be instantiated. (funkman) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org Subject: svn commit: r696408 - in /tomcat/trunk: conf/web.xml java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/default-servlet.xml From: markt@apache.org Date: Wed, 17 Sep 2008 19:26:23 +0000 To: dev@tomcat.apache.org Author: markt Date: Wed Sep 17 12:26:22 2008 New Revision: 696408 URL: http://svn.apache.org/viewvc?rev=696408&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45419 Set the Accept-Ranges header on content served from the DefaultServlet. This can be disabled via configuration if required. Modified: tomcat/trunk/conf/web.xml tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/trunk/webapps/docs/default-servlet.xml Modified: tomcat/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=696408&r1=696407&r2=696408&view=diff ============================================================================== --- tomcat/trunk/conf/web.xml (original) +++ tomcat/trunk/conf/web.xml Wed Sep 17 12:26:22 2008 @@ -70,6 +70,9 @@ + + + Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=696408&r1=696407&r2=696408&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Wed Sep 17 12:26:22 2008 @@ -154,7 +154,11 @@ */ protected int sendfileSize = 48 * 1024; - + /** + * Should the Accept-Ranges: bytes header be send with static resources? + */ + protected boolean useAcceptRanges = true; + /** * Full range marker. */ @@ -241,6 +245,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; @@ -717,9 +724,12 @@ contentType = "text/html;charset=UTF-8"; } else { + if (useAcceptRanges) { + // Accept ranges header + response.setHeader("Accept-Ranges", "bytes"); + } // Parse range specifier - ranges = parseRange(request, response, cacheEntry.attributes); // ETag header Modified: tomcat/trunk/webapps/docs/default-servlet.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/default-servlet.xml?rev=696408&r1=696407&r2=696408&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/default-servlet.xml (original) +++ tomcat/trunk/webapps/docs/default-servlet.xml Wed Sep 17 12:26:22 2008 @@ -179,6 +179,13 @@ to always disable sendfile. [48] + + useAcceptRanges + + If true, the Accept-Ranges header will be set when appropriate for the + response. [true] + + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org Subject: svn commit: r696402 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java From: markt@apache.org Date: Wed, 17 Sep 2008 19:10:01 +0000 To: dev@tomcat.apache.org Author: markt Date: Wed Sep 17 12:10:01 2008 New Revision: 696402 URL: http://svn.apache.org/viewvc?rev=696402&view=rev Log: Add generics to default servlet and fix other Eclipse warnings. No functional change. Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=696402&r1=696401&r2=696402&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Wed Sep 17 12:10:01 2008 @@ -158,7 +158,7 @@ /** * Full range marker. */ - protected static ArrayList FULL = new ArrayList(); + protected static ArrayList FULL = new ArrayList(); // ----------------------------------------------------- Static Initializer @@ -464,7 +464,7 @@ if (obj instanceof Resource) oldResource = (Resource) obj; } catch (NamingException e) { - ; + // Ignore } // Copy data in oldRevisionContent to contentFile @@ -702,7 +702,7 @@ cacheEntry.attributes.setMimeType(contentType); } - ArrayList ranges = null; + ArrayList ranges = null; long contentLength = -1L; if (cacheEntry.context != null) { @@ -823,7 +823,7 @@ if (ranges.size() == 1) { - Range range = (Range) ranges.get(0); + Range range = ranges.get(0); response.addHeader("Content-Range", "bytes " + range.start + "-" + range.end + "/" @@ -952,10 +952,9 @@ * @param response The servlet response we are creating * @return Vector of ranges */ - protected ArrayList parseRange(HttpServletRequest request, - HttpServletResponse response, - ResourceAttributes resourceAttributes) - throws IOException { + protected ArrayList parseRange(HttpServletRequest request, + HttpServletResponse response, + ResourceAttributes resourceAttributes) throws IOException { // Checking If-Range String headerValue = request.getHeader("If-Range"); @@ -966,7 +965,7 @@ try { headerValueTime = request.getDateHeader("If-Range"); } catch (IllegalArgumentException e) { - ; + // Ignore } String eTag = getETag(resourceAttributes); @@ -1132,14 +1131,15 @@ try { // Render the directory entries within this directory - NamingEnumeration enumeration = resources.list(cacheEntry.name); + NamingEnumeration enumeration = + resources.list(cacheEntry.name); // rewriteUrl(contextPath) is expensive. cache result for later reuse String rewrittenContextPath = rewriteUrl(contextPath); while (enumeration.hasMoreElements()) { - NameClassPair ncPair = (NameClassPair) enumeration.nextElement(); + NameClassPair ncPair = enumeration.nextElement(); String resourceName = ncPair.getName(); String trimmed = resourceName/*.substring(trim)*/; if (trimmed.equalsIgnoreCase("WEB-INF") || @@ -1303,11 +1303,12 @@ try { // Render the directory entries within this directory - NamingEnumeration enumeration = resources.list(cacheEntry.name); + NamingEnumeration enumeration = + resources.list(cacheEntry.name); boolean shade = false; while (enumeration.hasMoreElements()) { - NameClassPair ncPair = (NameClassPair) enumeration.nextElement(); + NameClassPair ncPair = enumeration.nextElement(); String resourceName = ncPair.getName(); String trimmed = resourceName/*.substring(trim)*/; if (trimmed.equalsIgnoreCase("WEB-INF") || @@ -1853,7 +1854,7 @@ * @exception IOException if an input/output error occurs */ protected void copy(CacheEntry cacheEntry, ServletOutputStream ostream, - Iterator ranges, String contentType) + Iterator ranges, String contentType) throws IOException { IOException exception = null; @@ -1864,7 +1865,7 @@ InputStream istream = new BufferedInputStream(resourceInputStream, input); - Range currentRange = (Range) ranges.next(); + Range currentRange = ranges.next(); // Writing MIME header. ostream.println(); @@ -1906,7 +1907,7 @@ * @exception IOException if an input/output error occurs */ protected void copy(CacheEntry cacheEntry, PrintWriter writer, - Iterator ranges, String contentType) + Iterator ranges, String contentType) throws IOException { IOException exception = null; @@ -1923,7 +1924,7 @@ fileEncoding); } - Range currentRange = (Range) ranges.next(); + Range currentRange = ranges.next(); // Writing MIME header. writer.println(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org Subject: svn commit: r693962 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java From: markt@apache.org Date: Wed, 10 Sep 2008 20:02:34 +0000 To: dev@tomcat.apache.org Author: markt Date: Wed Sep 10 13:02:34 2008 New Revision: 693962 URL: http://svn.apache.org/viewvc?rev=693962&view=rev Log: Include fix for 43117 in trunk Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=693962&r1=693961&r2=693962&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Sep 10 13:02:34 2008 @@ -1882,6 +1882,9 @@ * @return The work path */ public String getWorkPath() { + if (getWorkDir() == null) { + return null; + } File workDir = new File(getWorkDir()); if (!workDir.isAbsolute()) { File catalinaHome = engineBase(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org Subject: svn commit: r691686 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/connector/CoyoteAdapter.java webapps/docs/changelog.xml From: rjung@apache.org Date: Wed, 03 Sep 2008 16:59:20 +0000 To: dev@tomcat.apache.org Author: rjung Date: Wed Sep 3 09:59:19 2008 New Revision: 691686 URL: http://svn.apache.org/viewvc?rev=691686&view=rev Log: Port of http://svn.apache.org/viewvc?rev=688857&view=rev See also: http://marc.info/?t=121967803300004&r=1&w=2 No changelog entry, because the change is only for consistency of the code, at least until we port IntermediateInputStream.available() from tc5.5.x B2CConverter forward. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=691686&r1=691685&r2=691686&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 3 09:59:19 2008 @@ -98,16 +98,6 @@ -1: -* Fix redirect loop when using URIEncoding="UTF-8" - http://svn.apache.org/viewvc?rev=688857&view=rev - See also: http://marc.info/?t=121967803300004&r=1&w=2 - This is not yet a problem for TC6.0.x, but will be - once we port IntermediateInputStream.available() - from TC5.5.x B2CConverter forward. - I propose to keep the CoyoteAdapter code consistent. - +1: rjung, fhanik, remm - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43327 http://svn.apache.org/viewvc?rev=687755&view=rev Note use trunk >=r690600 of TC-native to test it as it also needs patches Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=691686&r1=691685&r2=691686&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Wed Sep 3 09:59:19 2008 @@ -613,8 +613,6 @@ if (conv == null) { conv = new B2CConverter(enc); request.setURIConverter(conv); - } else { - conv.recycle(); } } catch (IOException e) { // Ignore Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=691686&r1=691685&r2=691686&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Sep 3 09:59:19 2008 @@ -33,7 +33,7 @@
- + 45453: Remove potential race condition in JDBC Realm. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: