Merge remote-tracking branch 'origin/master' into servlet-3.1-api

1 files changed, 7 insertions, 2 deletions

diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
index bd10743932..60456a53ac 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
@@ -235,7 +235,7 @@ public abstract class AbstractCompressedStream extends ServletOutputStream
             setHeader("Content-Encoding", _encoding);
                 if (_response.containsHeader("Content-Encoding"))
                 {
-                    setHeader("Vary",_vary);
+                    addHeader("Vary",_vary);
                     _out=_compressedOutputStream=createStream();
                     if (_out!=null)
                     {
@@ -270,7 +270,7 @@ public abstract class AbstractCompressedStream extends ServletOutputStream
         if (_out == null || _bOut != null)
         {
             if (sendVary)
-                setHeader("Vary",_vary);
+                addHeader("Vary",_vary);
             if (_wrapper.getETag()!=null)
                 setHeader("ETag",_wrapper.getETag());
                 
@@ -342,6 +342,11 @@ public abstract class AbstractCompressedStream extends ServletOutputStream
         return encoding == null?new PrintWriter(out):new PrintWriter(new OutputStreamWriter(out,encoding));
     }
 
+    protected void addHeader(String name,String value)
+    {
+        _response.addHeader(name, value);
+    }
+
     protected void setHeader(String name,String value)
     {
         _response.setHeader(name, value);