Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Simone Bordet 2016-06-01 10:48:57 +02:00
parent 82921382a7 8d9c086fa4
commit 8956245026
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/embedded/src/main/java/org/eclipse/jetty/embedded/FastFileServer.java
View File

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

1
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java
View File

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