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

431642 Allow for immediate return from content callback in HttpParser

This commit is contained in:
Greg Wilkins 2014-04-10 12:58:58 +10:00
parent 9a7af6cbd3
commit 4785121a53
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
View File

@ -1357,24 +1357,36 @@ public class HttpParser
protected boolean parseContent(ByteBuffer buffer) protected boolean parseContent(ByteBuffer buffer)
{ {
int remaining=buffer.remaining();
if (remaining==0 && _state==State.CONTENT)
{
long content=_contentLength - _contentPosition;
if (content == 0)
{
setState(State.END);
if (_handler.messageComplete())
return true;
}
}
// Handle _content // Handle _content
byte ch; byte ch;
while (_state.ordinal() < State.END.ordinal() && buffer.hasRemaining()) while (_state.ordinal() < State.END.ordinal() && remaining>0)
{ {
switch (_state) switch (_state)
{ {
case EOF_CONTENT: case EOF_CONTENT:
_contentChunk=buffer.asReadOnlyBuffer(); _contentChunk=buffer.asReadOnlyBuffer();
_contentPosition += _contentChunk.remaining(); _contentPosition += remaining;
buffer.position(buffer.position()+_contentChunk.remaining()); buffer.position(buffer.position()+remaining);
if (_handler.content(_contentChunk)) if (_handler.content(_contentChunk))
return true; return true;
break; break;
case CONTENT: case CONTENT:
{ {
long remaining=_contentLength - _contentPosition; long content=_contentLength - _contentPosition;
if (remaining == 0) if (content == 0)
{ {
setState(State.END); setState(State.END);
if (_handler.messageComplete()) if (_handler.messageComplete())
@ -1385,25 +1397,25 @@ public class HttpParser
_contentChunk=buffer.asReadOnlyBuffer(); _contentChunk=buffer.asReadOnlyBuffer();
// limit content by expected size // limit content by expected size
if (_contentChunk.remaining() > remaining) if (remaining > content)
{ {
// We can cast remaining to an int as we know that it is smaller than // We can cast remaining to an int as we know that it is smaller than
// or equal to length which is already an int. // or equal to length which is already an int.
_contentChunk.limit(_contentChunk.position()+(int)remaining); _contentChunk.limit(_contentChunk.position()+(int)content);
} }
_contentPosition += _contentChunk.remaining(); _contentPosition += _contentChunk.remaining();
buffer.position(buffer.position()+_contentChunk.remaining()); buffer.position(buffer.position()+_contentChunk.remaining());
boolean handle=_handler.content(_contentChunk); if (_handler.content(_contentChunk))
return true;
if(_contentPosition == _contentLength) if(_contentPosition == _contentLength)
{ {
setState(State.END); setState(State.END);
if (_handler.messageComplete()) if (_handler.messageComplete())
return true; return true;
} }
if (handle)
return true;
} }
break; break;
} }
@ -1463,8 +1475,8 @@ public class HttpParser
case CHUNK: case CHUNK:
{ {
int remaining=_chunkLength - _chunkPosition; int chunk=_chunkLength - _chunkPosition;
if (remaining == 0) if (chunk == 0)
{ {
setState(State.CHUNKED_CONTENT); setState(State.CHUNKED_CONTENT);
} }
@ -1472,13 +1484,13 @@ public class HttpParser
{ {
_contentChunk=buffer.asReadOnlyBuffer(); _contentChunk=buffer.asReadOnlyBuffer();
if (_contentChunk.remaining() > remaining) if (remaining > chunk)
_contentChunk.limit(_contentChunk.position()+remaining); _contentChunk.limit(_contentChunk.position()+chunk);
remaining=_contentChunk.remaining(); chunk=_contentChunk.remaining();
_contentPosition += remaining; _contentPosition += chunk;
_chunkPosition += remaining; _chunkPosition += chunk;
buffer.position(buffer.position()+remaining); buffer.position(buffer.position()+chunk);
if (_handler.content(_contentChunk)) if (_handler.content(_contentChunk))
return true; return true;
} }
@ -1493,7 +1505,10 @@ public class HttpParser
default: default:
break; break;
} }
remaining=buffer.remaining();
} }
return false; return false;
} }