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

HttpChannelOverHttp uses held values rather than request

This commit is contained in:
Greg Wilkins 2014-07-11 16:09:36 +10:00
parent f594a6fc66
commit 2d057bea13
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java
View File

@ -132,7 +132,7 @@ class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandl
case EXPECT: case EXPECT:
{ {
if (getRequest().getHttpVersion().getVersion()==HttpVersion.HTTP_1_1.getVersion()) if (_version==HttpVersion.HTTP_1_1)
{ {
HttpHeaderValue expect = HttpHeaderValue.CACHE.get(value); HttpHeaderValue expect = HttpHeaderValue.CACHE.get(value);
switch (expect == null ? HttpHeaderValue.UNKNOWN : expect) switch (expect == null ? HttpHeaderValue.UNKNOWN : expect)
@ -213,7 +213,7 @@ class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandl
public void earlyEOF() public void earlyEOF()
{ {
// If we have no request yet, just close // If we have no request yet, just close
if (getRequest().getMethod()==null) if (_method==null)
_httpConnection.close(); _httpConnection.close();
else else
onEarlyEOF(); onEarlyEOF();
@ -254,7 +254,7 @@ class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandl
persistent=false; persistent=false;
if (!persistent) if (!persistent)
persistent = HttpMethod.CONNECT.is(getRequest().getMethod()); persistent = HttpMethod.CONNECT.is(_method);
if (persistent) if (persistent)
getResponse().getHttpFields().add(HttpHeader.CONNECTION, HttpHeaderValue.KEEP_ALIVE); getResponse().getHttpFields().add(HttpHeader.CONNECTION, HttpHeaderValue.KEEP_ALIVE);
@ -280,7 +280,7 @@ class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandl
persistent=true; persistent=true;
if (!persistent) if (!persistent)
persistent = HttpMethod.CONNECT.is(getRequest().getMethod()); persistent = HttpMethod.CONNECT.is(_method);
if (!persistent) if (!persistent)
getResponse().getHttpFields().add(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE); getResponse().getHttpFields().add(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE);
break; break;