You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/03/08 21:48:36 UTC
svn commit: r1734152 -
/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Author: markt
Date: Tue Mar 8 20:48:36 2016
New Revision: 1734152
URL: http://svn.apache.org/viewvc?rev=1734152&view=rev
Log:
Line lengths
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=1734152&r1=1734151&r2=1734152&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Mar 8 20:48:36 2016
@@ -281,7 +281,8 @@ public class DefaultServlet extends Http
if (getServletConfig().getInitParameter("readonly") != null)
readOnly = Boolean.parseBoolean(getServletConfig().getInitParameter("readonly"));
- compressionFormats = parseCompressionFormats(getServletConfig().getInitParameter("precompressed"),
+ compressionFormats = parseCompressionFormats(
+ getServletConfig().getInitParameter("precompressed"),
getServletConfig().getInitParameter("gzip"));
if (getServletConfig().getInitParameter("sendfileSize") != null)
@@ -824,8 +825,10 @@ public class DefaultServlet extends Http
// Serve a precompressed version of the file if present
boolean usingPrecompressedVersion = false;
- if (compressionFormats.length > 0 && !included && resource.isFile() && !pathEndsWithCompressedExtension(path)) {
- List<PrecompressedResource> precompressedResources = getAvailablePrecompressedResources(path);
+ if (compressionFormats.length > 0 && !included && resource.isFile() &&
+ !pathEndsWithCompressedExtension(path)) {
+ List<PrecompressedResource> precompressedResources =
+ getAvailablePrecompressedResources(path);
if (!precompressedResources.isEmpty()) {
Collection<String> varyHeaders = response.getHeaders("Vary");
boolean addRequired = true;
@@ -839,7 +842,8 @@ public class DefaultServlet extends Http
if (addRequired) {
response.addHeader("Vary", "accept-encoding");
}
- PrecompressedResource bestResource = getBestPrecompressedResource(request, precompressedResources);
+ PrecompressedResource bestResource =
+ getBestPrecompressedResource(request, precompressedResources);
if (bestResource != null) {
response.addHeader("Content-Encoding", bestResource.format.encoding);
resource = bestResource.resource;
@@ -1089,7 +1093,8 @@ public class DefaultServlet extends Http
* @param precompressedResources List of available precompressed resources.
* @return The best matching precompressed resource or null if no match was found.
*/
- private PrecompressedResource getBestPrecompressedResource(HttpServletRequest request, List<PrecompressedResource> precompressedResources) {
+ private PrecompressedResource getBestPrecompressedResource(HttpServletRequest request,
+ List<PrecompressedResource> precompressedResources) {
Enumeration<String> headers = request.getHeaders("Accept-Encoding");
PrecompressedResource bestResource = null;
double bestResourceQuality = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org