Merged branch 'jetty-9.4.x' into 'master'.

examples/embedded/src/main/java/org/eclipse/jetty/embedded/FastFileServer.java

@@ -128,7 +128,7 @@ public class FastFileServer
             // Jetty DefaultServlet will cache formatted date strings, but we
             // will reformat for each request here
             response.setDateHeader("Last-Modified", file.lastModified());
-            response.setDateHeader("Content-Length", file.length());
+            response.setContentLengthLong(file.length());
             response.setContentType(mimeTypes.getMimeByExtension(file.getName()));
 
             // send "small" files blocking directly from an input stream

jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java

@@ -262,6 +262,7 @@ public class HttpClientRedirectTest extends AbstractHttpClientServerTest
     }
 
     @Test
+    @Ignore
     public void testRedirectWithWrongScheme() throws Exception
     {
         start(new AbstractHandler()