From bba5d5e6906bc193a2679a8b18eccc5a83429fca Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 8 Feb 2010 02:27:43 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48660 Compression should add to Vary header rather than over-write it git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@907544 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/Http11AprProcessor.java | 2 +- java/org/apache/coyote/http11/Http11NioProcessor.java | 2 +- java/org/apache/coyote/http11/Http11Processor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index a53076b99..6d73e6ef4 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -1660,7 +1660,7 @@ public class Http11AprProcessor implements ActionHook { outputBuffer.addActiveFilter(outputFilters[Constants.GZIP_FILTER]); headers.setValue("Content-Encoding").setString("gzip"); // Make Proxies happy via Vary (from mod_deflate) - headers.setValue("Vary").setString("Accept-Encoding"); + headers.addValue("Vary").setString("Accept-Encoding"); } // Add date header diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java index 9d9a44262..506cfd8f4 100644 --- a/java/org/apache/coyote/http11/Http11NioProcessor.java +++ b/java/org/apache/coyote/http11/Http11NioProcessor.java @@ -1159,7 +1159,7 @@ public class Http11NioProcessor extends AbstractHttp11Processor implements Actio outputBuffer.addActiveFilter(outputFilters[Constants.GZIP_FILTER]); headers.setValue("Content-Encoding").setString("gzip"); // Make Proxies happy via Vary (from mod_deflate) - headers.setValue("Vary").setString("Accept-Encoding"); + headers.addValue("Vary").setString("Accept-Encoding"); } // Add date header diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java index 37c0df808..9df0ac76d 100644 --- a/java/org/apache/coyote/http11/Http11Processor.java +++ b/java/org/apache/coyote/http11/Http11Processor.java @@ -815,7 +815,7 @@ public class Http11Processor extends AbstractHttp11Processor implements ActionHo outputBuffer.addActiveFilter(outputFilters[Constants.GZIP_FILTER]); headers.setValue("Content-Encoding").setString("gzip"); // Make Proxies happy via Vary (from mod_deflate) - headers.setValue("Vary").setString("Accept-Encoding"); + headers.addValue("Vary").setString("Accept-Encoding"); } // Add date header -- 2.11.0