Merge remote-tracking branch 'origin/master' into jetty-http2

This commit is contained in:
Greg Wilkins 2014-08-07 15:29:12 +10:00
commit 55aa2a07b4
1 changed files with 11 additions and 1 deletions

View File

@ -292,6 +292,15 @@ public abstract class HttpInput extends ServletInputStream implements Runnable
_channelState.onReadPossible();
}
public boolean isEarlyEOF()
{
synchronized (lock())
{
return _contentState==EARLY_EOF;
}
}
/**
* This method should be called to signal that all the expected
* content arrived.
@ -361,6 +370,7 @@ public abstract class HttpInput extends ServletInputStream implements Runnable
return _contentState.isEOF();
}
}
@Override
public boolean isReady()
@ -517,7 +527,7 @@ public abstract class HttpInput extends ServletInputStream implements Runnable
@Override
public int noContent() throws IOException
{
throw new EofException();
throw new EofException("Early EOF");
}
@Override