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

306782 httpbis interpretation of 100 continues. Body never skipped 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1419 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-03-30 08:59:31 +00:00
parent 6c2741bbd6
commit 25ee7b272c
3 changed files with 7 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -5,7 +5,7 @@ jetty-7.0.2.SNAPSHOT
+ 306840 Suppress content-length in requests with no content
+ 306880 Support for UPGRADE in HttpClient
+ 306884 Suspend with timeout <=0 never expires
+ 306782 Don't skip content if 100 not sent, but content available
+ 306782 httpbis interpretation of 100 continues. Body never skipped
jetty-7.0.2.RC0
+ JSON parses NaN as null

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

@ -638,30 +638,12 @@ public class HttpConnection implements Connection
if (_expect100Continue)
{
// We didn't send a response, but if there is
// content, then the client obviously ignored 100 mechanism
// and we need to read it. If there is no content, then
// we should not expect any to arrive and should skip
// it
Log.debug("100 continues not sent");
// We didn't send 100 continues, but the latest interpretation
// of the spec (see httpbis) is that the client will either
// send the body anyway, or close. So we no longer need to
// do anything special here.
_expect100Continue = false;
if (_parser instanceof HttpParser )
{
HttpParser parser=(HttpParser)_parser;
// if response is committed, then _expect100Continue was not cleared
// in commitResponse(boolean) or completeResponse(), so any data that
// is available must have arrived after the commit and should be a new
// request. So we should skip any unexpected content for this request.
if (_generator.isCommitted())
((HttpParser)_parser).setState(HttpParser.STATE_END);
// else if there is not already content, then let's not expect any.
else if (
((parser.getHeaderBuffer()==null || parser.getHeaderBuffer().length()<2) &&
(parser.getBodyBuffer()==null || parser.getBodyBuffer().length()<1)))
((HttpParser)_parser).setState(HttpParser.STATE_END);
}
}
if(_endp.isOpen())
@ -693,20 +675,6 @@ public class HttpConnection implements Connection
{
if (!_generator.isCommitted())
{
if (_expect100Continue && _parser instanceof HttpParser)
{
// We didn't send a 100 continues, so if there is
// content, then the client obviously ignored the spec
// and sent the body anyway. So we can cancel the
// expected status.
HttpParser parser=(HttpParser)_parser;
// is there already content?
if ((parser.getHeaderBuffer()!=null && parser.getHeaderBuffer().length()>=2) ||
(parser.getBodyBuffer()!=null && parser.getBodyBuffer().length()>0))
_expect100Continue = false; // 100 mechanism has been ignored.
}
_generator.setResponse(_response.getStatus(), _response.getReason());
try
{
@ -738,20 +706,6 @@ public class HttpConnection implements Connection
{
if (!_generator.isCommitted())
{
if (_expect100Continue && _parser instanceof HttpParser)
{
// We didn't send a 100 continues, so if there is
// content, then the client obviously ignored the spec
// and sent the body anyway. So we can cancel the
// expected status.
HttpParser parser=(HttpParser)_parser;
// is there already content?
if ((parser.getHeaderBuffer()!=null && parser.getHeaderBuffer().length()>=2) ||
(parser.getBodyBuffer()!=null && parser.getBodyBuffer().length()>0))
_expect100Continue = false; // 100 mechanism has been ignored.
}
_generator.setResponse(_response.getStatus(), _response.getReason());
try
{

2
jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java
View File

@ -338,7 +338,7 @@ public class StatisticsHandlerTest extends TestCase
Continuation continuation = ContinuationSupport.getContinuation(httpRequest);
if (continuationHandle.get() == null)
{
continuation.setTimeout(10);
continuation.setTimeout(100);
continuation.suspend();
continuationHandle.set(continuation);
}