Merge branch 'jetty-7' into jetty-8

jetty-distribution/pom.xml

@@ -363,11 +363,6 @@
       <artifactId>jetty-client</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-continuation</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-start</artifactId>

jetty-server/src/main/java/org/eclipse/jetty/server/Connector.java

@@ -215,7 +215,7 @@ public interface Connector extends LifeCycle
 
     /* ------------------------------------------------------------ */
     /**
-     * @param port The port fto listen of for connections or 0 if any available
+     * @param port The port to listen of for connections or 0 if any available
      * port may be used.
      */
     void setPort(int port);

jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java

@@ -550,51 +550,4 @@ public class GzipFilter extends UserAgentFilter
         }
         return false;
     }
-    
-    private class VaryResponseWrapper extends HttpServletResponseWrapper
-    {
-        public VaryResponseWrapper(HttpServletResponse response)
-        {
-            super(response);
-        }
-
-        @Override
-        public void addHeader(String name, String value)
-        {
-            if ("content-type".equalsIgnoreCase(name))
-            {   
-                setContentType(value);
-            }
-            else
-                super.addHeader(name,value);
-        }
-
-        @Override
-        public void setHeader(String name, String value)
-        {
-            if ("content-type".equalsIgnoreCase(name))
-            {   
-                setContentType(value);
-            }
-            else
-                super.setHeader(name,value);
-        }
-
-        @Override
-        public void setContentType(String ct)
-        {
-            super.setContentType(ct);
-        
-            if (ct!=null)
-            {
-                int colon=ct.indexOf(";");
-                if (colon>0)
-                    ct=ct.substring(0,colon);
-            }
-        
-            if (_mimeTypes!=null && _mimeTypes.contains(StringUtil.asciiToLowerCase(ct)))
-                super.setHeader("Vary",_vary);
-                
-        }
-    }
 }

test-jetty-webapp/pom.xml

@@ -163,6 +163,11 @@
       <artifactId>jetty-servlets</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.servlet</artifactId>