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

Issue #2549 ConsumeAll forced EOF or EarlyEOF 

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2018-05-17 13:05:13 +10:00
parent aa97518d0b
commit b93cc5abb6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpChannelOverHTTP.java
View File

@ -102,8 +102,8 @@ public class HttpChannelOverHTTP extends HttpChannel
if ((response.getVersion() == HttpVersion.HTTP_1_1) &&
(response.getStatus() == HttpStatus.SWITCHING_PROTOCOLS_101))
{
String connection = response.getHeaders().get(HttpHeader.CONNECTION);
if ((connection == null) || !connection.toLowerCase(Locale.US).contains("upgrade"))
String next_connection = response.getHeaders().get(HttpHeader.CONNECTION);
if ((next_connection == null) || !next_connection.toLowerCase(Locale.US).contains("upgrade"))
{
return new Result(result,new HttpResponseException("101 Switching Protocols without Connection: Upgrade not supported",response));
}

5
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
View File

@ -686,6 +686,11 @@ public class HttpInput extends ServletInputStream implements Runnable
LOG.debug(e);
return false;
}
finally
{
if (!EOFState.class.isInstance(_state))
_state = EARLY_EOF;
}
}
}