Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-07-04 03:28:22 -0400
committerGreg Wilkins2013-07-04 03:28:22 -0400
commitbce8eaabe02823dffc8243ea0eb9b14683eaf3ab (patch)
treed070e8ada619c06f7b6ebf58e064fe7427a3adcf /jetty-servlets/src
parent89ce13c19146c5e652be277f45144791e5e36886 (diff)
parent606c042691babeded00e1274cb6951c3ca611a20 (diff)
downloadorg.eclipse.jetty.project-bce8eaabe02823dffc8243ea0eb9b14683eaf3ab.tar.gz
org.eclipse.jetty.project-bce8eaabe02823dffc8243ea0eb9b14683eaf3ab.tar.xz
org.eclipse.jetty.project-bce8eaabe02823dffc8243ea0eb9b14683eaf3ab.zip
Merge remote-tracking branch 'origin/jetty-8'
Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
Diffstat (limited to 'jetty-servlets/src')
-rw-r--r--jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
index fe1ab1a4fa..1cf6f10068 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
@@ -110,8 +110,8 @@ public class GzipTester
// Assert.assertThat("Response.status",response.getStatus(),is(HttpServletResponse.SC_OK));
// Response headers should have either a Transfer-Encoding indicating chunked OR a Content-Length
- String contentLength = response.getHeader("Content-Length");
- String transferEncoding = response.getHeader("Transfer-Encoding");
+ String contentLength = response.get("Content-Length");
+ String transferEncoding = response.get("Transfer-Encoding");
/* TODO need to check for the 3rd option of EOF content. To do this properly you might need to look at both HTTP/1.1 and HTTP/1.0 requests
boolean chunked = (transferEncoding != null) && (transferEncoding.indexOf("chunk") >= 0);

Back to the top