From 2d057bea13f275942f175437175bd01e052904c7 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 11 Jul 2014 16:09:36 +1000 Subject: [PATCH] HttpChannelOverHttp uses held values rather than request --- .../org/eclipse/jetty/server/HttpChannelOverHttp.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java index 16e4d16e8c6..7fd13dbd6a5 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java @@ -132,7 +132,7 @@ class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandl case EXPECT: { - if (getRequest().getHttpVersion().getVersion()==HttpVersion.HTTP_1_1.getVersion()) + if (_version==HttpVersion.HTTP_1_1) { HttpHeaderValue expect = HttpHeaderValue.CACHE.get(value); switch (expect == null ? HttpHeaderValue.UNKNOWN : expect) @@ -213,7 +213,7 @@ class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandl public void earlyEOF() { // If we have no request yet, just close - if (getRequest().getMethod()==null) + if (_method==null) _httpConnection.close(); else onEarlyEOF(); @@ -254,7 +254,7 @@ class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandl persistent=false; if (!persistent) - persistent = HttpMethod.CONNECT.is(getRequest().getMethod()); + persistent = HttpMethod.CONNECT.is(_method); if (persistent) getResponse().getHttpFields().add(HttpHeader.CONNECTION, HttpHeaderValue.KEEP_ALIVE); @@ -280,7 +280,7 @@ class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandl persistent=true; if (!persistent) - persistent = HttpMethod.CONNECT.is(getRequest().getMethod()); + persistent = HttpMethod.CONNECT.is(_method); if (!persistent) getResponse().getHttpFields().add(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE); break;