363408 GzipFilter should not attempt to compress HTTP status 204

jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java

@@ -691,7 +691,7 @@ public class HttpGenerator extends AbstractGenerator
                     {
                         // we have seen all the _content there is
                         _contentLength = _contentWritten;
-                        if (content_length == null && (isResponse() || _contentLength>0 || content_type ))
+                        if (content_length == null && (isResponse() || _contentLength>0 || content_type ) && !_noContent)
                         {
                             // known length but not actually set.
                             _header.put(HttpHeaders.CONTENT_LENGTH_BUFFER);

jetty-http/src/main/java/org/eclipse/jetty/http/gzip/GzipResponseWrapper.java

@@ -120,7 +120,7 @@ public class GzipResponseWrapper extends HttpServletResponseWrapper
     public void setStatus(int sc, String sm)
     {
         super.setStatus(sc,sm);
-        if (sc<200||sc>=300)
+        if (sc<200 || sc==204 || sc==205 || sc>=300)
             noGzip();
     }
 
@@ -131,7 +131,7 @@ public class GzipResponseWrapper extends HttpServletResponseWrapper
     public void setStatus(int sc)
     {
         super.setStatus(sc);
-        if (sc<200||sc>=300)
+        if (sc<200 || sc==204 || sc==205 ||sc>=300)
             noGzip();
     }
 

jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import javax.servlet.Servlet;
 
+import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.http.gzip.GzipResponseWrapper;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.FilterHolder;
@@ -104,7 +105,7 @@ public class GzipFilterContentLengthTest
         try
         {
             tester.start();
-            tester.assertIsResponseNotGzipCompressed(filename,filesize);
+            tester.assertIsResponseNotGzipCompressed(filename,filesize,HttpStatus.OK_200);
         }
         finally
         {

jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java

@@ -1,5 +1,13 @@
 package org.eclipse.jetty.servlets;
 
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.http.gzip.GzipResponseWrapper;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.FilterHolder;
@@ -13,6 +21,29 @@ import org.junit.Test;
  */
 public class GzipFilterDefaultTest
 {
+    
+    
+    public static class HttpStatusServlet extends HttpServlet
+    {
+        private int _status = 204;
+        
+        public HttpStatusServlet()
+        {
+            super();
+        }
+        
+        public void setStatus (int status)
+        {
+            _status = status;
+        }
+
+        @Override
+        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+        {
+            resp.setStatus(_status);
+        }
+        
+    }
     @Rule
     public TestingDir testingdir = new TestingDir();
 
@@ -77,11 +108,33 @@ public class GzipFilterDefaultTest
         try
         {
             tester.start();
-            tester.assertIsResponseNotGzipCompressed("file.mp3", filesize);
+            tester.assertIsResponseNotGzipCompressed("file.mp3", filesize, HttpStatus.OK_200);
         }
         finally
         {
             tester.stop();
         }
     }
+    
+    @Test
+    public void testIsNotGzipCompressedHttpStatus() throws Exception
+    { 
+        GzipTester tester = new GzipTester(testingdir);
+
+        // Test error code 204
+        FilterHolder holder = tester.setContentServlet(HttpStatusServlet.class);
+        holder.setInitParameter("mimeTypes","text/plain");
+
+        try
+        {
+            tester.start();
+            tester.assertIsResponseNotGzipCompressed(null, -1, 204);
+        }
+        finally
+        {
+            tester.stop();
+        }
+
+    }
+
 }

jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java

@@ -202,7 +202,7 @@ public class GzipTester
      *            passing -1 will disable the Content-Length assertion)
      * @throws Exception
      */
-    public void assertIsResponseNotGzipCompressed(String filename, int expectedFilesize) throws Exception
+    public void assertIsResponseNotGzipCompressed(String filename, int expectedFilesize, int status) throws Exception
     {
         System.err.printf("[GzipTester] requesting /context/%s%n",filename);
         HttpTester request = new HttpTester();
@@ -212,7 +212,10 @@ public class GzipTester
         request.setVersion("HTTP/1.0");
         request.setHeader("Host","tester");
         request.setHeader("Accept-Encoding","gzip");
-        request.setURI("/context/" + filename);
+        if (filename == null)
+            request.setURI("/context/");
+        else
+            request.setURI("/context/"+filename);
 
         // Issue the request
         ByteArrayBuffer reqsBuff = new ByteArrayBuffer(request.generate().getBytes());
@@ -222,7 +225,7 @@ public class GzipTester
 
         // Assert the response headers
         Assert.assertThat("Response.method",response.getMethod(),nullValue());
-        Assert.assertThat("Response.status",response.getStatus(),is(HttpServletResponse.SC_OK));
+        Assert.assertThat("Response.status",response.getStatus(),is(status));
         if (expectedFilesize != (-1))
         {
             Assert.assertThat("Response.header[Content-Length]",response.getHeader("Content-Length"),notNullValue());
@@ -230,29 +233,35 @@ public class GzipTester
             Assert.assertThat("Response.header[Content-Length]",serverLength,is(expectedFilesize));
         }
         Assert.assertThat("Response.header[Content-Encoding]",response.getHeader("Content-Encoding"),not(containsString("gzip")));
-
+        
         // Assert that the contents are what we expect.
-        File serverFile = testdir.getFile(filename);
+        if (filename != null)
-        String expected = IO.readToString(serverFile);
-        String actual = null;
-
-        InputStream in = null;
-        ByteArrayOutputStream out = null;
-        try
         {
-            in = new ByteArrayInputStream(response.getContentBytes());
+            File serverFile = testdir.getFile(filename);
-            out = new ByteArrayOutputStream();
+            String expected = IO.readToString(serverFile);
-            IO.copy(in,out);
+            String actual = null;
 
-            actual = out.toString(encoding);
+            InputStream in = null;
-            Assert.assertEquals("Server contents",expected,actual);
+            ByteArrayOutputStream out = null;
-        }
+            try
-        finally
+            {
-        {
+                in = new ByteArrayInputStream(response.getContentBytes());
-            IO.close(out);
+                out = new ByteArrayOutputStream();
-            IO.close(in);
+                IO.copy(in,out);
+
+                actual = out.toString(encoding);
+                Assert.assertEquals("Server contents",expected,actual);
+            }
+            finally
+            {
+                IO.close(out);
+                IO.close(in);
+            }
         }
     }
+    
+    
+  
 
     /**
      * Generate string content of arbitrary length.
@@ -342,6 +351,8 @@ public class GzipTester
         FilterHolder holder = servletTester.addFilter(GzipFilter.class,"/*",0);
         return holder;
     }
+    
+  
 
     public void setEncoding(String encoding)
     {