Merge branch 'master' into release

2011-10-06 17:00:34 -05:00 · 2011-10-06 17:00:34 -05:00 · 6dc33497d9
parent b58006b4a4 074722f8c7
commit 6dc33497d9
1 changed files with 1 additions and 1 deletions
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
@ -278,7 +278,7 @@ public class HttpConnection extends AbstractConnection implements Dumpable
                        long filled = _parser.parseAvailable();
                        io += filled;

-                        if (_parser.isIdle() && _endp.isInputShutdown())
+                        if (_parser.isIdle() && (_endp.isInputShutdown() || !_endp.isOpen()))
                            throw new EOFException();
                    }