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

Revert "434810 better handling of bad messages" 

This reverts commit 3f4a8abf9e.
This commit is contained in:
Jesse McConnell 2014-05-26 11:20:00 -05:00
parent 3f95a601df
commit aa3c9322a6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
View File

@ -226,7 +226,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
filled = getEndPoint().fill(_requestBuffer); filled = getEndPoint().fill(_requestBuffer);
if (filled==0) // Do a retry on fill 0 (optimization for SSL connections) if (filled==0) // Do a retry on fill 0 (optimization for SSL connections)
filled = getEndPoint().fill(_requestBuffer); filled = getEndPoint().fill(_requestBuffer);
// tell parser // tell parser
if (filled < 0) if (filled < 0)
_parser.atEOF(); _parser.atEOF();
@ -476,12 +476,9 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
{ {
if (status<0) if (status<0)
{ {
EndPoint ep = getEndPoint(); getEndPoint().close();
while (ep.getTransport() instanceof EndPoint)
ep=(EndPoint)ep.getTransport();
ep.close();
_parser.atEOF(); _parser.atEOF();
LOG.debug("badMessage -1 close of {}",getEndPoint()); LOG.info("Bad message close of "+getEndPoint());
completed(); completed();
} }
else else