404128 Add Vary headers rather than set them

1 files changed, 10 insertions, 27 deletions

diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java
index 5ba2be0022..d07787f7b8 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java
@@ -84,15 +84,6 @@ public class IncludableGzipFilter extends GzipFilter
                         {
                             return null;
                         }
-
-                        @Override
-                        protected void setHeader(String name, String value)
-                        {
-                            super.setHeader(name, value);
-                            HttpServletResponse response = (HttpServletResponse)getResponse();
-                            if (!response.containsHeader(name))
-                                response.setHeader("org.eclipse.jetty.server.include." + name, value);
-                        }
                     };
                 }
             };
@@ -111,15 +102,6 @@ public class IncludableGzipFilter extends GzipFilter
                         {
                             return new GZIPOutputStream(_response.getOutputStream(),_bufferSize);
                         }
-
-                        @Override
-                        protected void setHeader(String name, String value)
-                        {
-                            super.setHeader(name, value);
-                            HttpServletResponse response = (HttpServletResponse)getResponse();
-                            if (!response.containsHeader(name))
-                                response.setHeader("org.eclipse.jetty.server.include." + name, value);
-                        }
                     };
                 }
             };
@@ -138,15 +120,6 @@ public class IncludableGzipFilter extends GzipFilter
                         {
                             return new DeflaterOutputStream(_response.getOutputStream(),new Deflater(_deflateCompressionLevel, _deflateNoWrap));
                         }
-
-                        @Override
-                        protected void setHeader(String name, String value)
-                        {
-                            super.setHeader(name, value);
-                            HttpServletResponse response = (HttpServletResponse)getResponse();
-                            if (!response.containsHeader(name))
-                                response.setHeader("org.eclipse.jetty.server.include." + name, value);
-                        }
                     };
                 }
             };
@@ -176,6 +149,16 @@ public class IncludableGzipFilter extends GzipFilter
             if (!response.containsHeader(name))
                 response.setHeader("org.eclipse.jetty.server.include."+name,value);
         }
+
+        @Override
+        public void addHeader(String name, String value)
+        {
+            super.addHeader(name, value);
+            HttpServletResponse response = (HttpServletResponse)getResponse();
+            if (!response.containsHeader(name))
+                setHeader(name,value);
+        }
+        
         @Override
         protected PrintWriter newWriter(OutputStream out, String encoding) throws UnsupportedEncodingException
         {