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

465181 HttpParser delay messageComplete until after chunk trailer

This commit is contained in:
Greg Wilkins 2015-04-22 20:55:10 +10:00
parent a7bd9d1dd9
commit f061ae79f4
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,6 +117,7 @@ public class HttpParser
CHUNK_SIZE,
CHUNK_PARAMS,
CHUNK,
CHUNK_END,
END,
CLOSED
}
@ -1453,10 +1454,7 @@ public class HttpParser
if (ch == HttpTokens.LINE_FEED)
{
if (_chunkLength == 0)
{
setState(State.END);
return _handler.messageComplete();
}
setState(State.CHUNK_END);
else
setState(State.CHUNK);
}
@ -1473,10 +1471,7 @@ public class HttpParser
if (ch == HttpTokens.LINE_FEED)
{
if (_chunkLength == 0)
{
setState(State.END);
return _handler.messageComplete();
}
setState(State.CHUNK_END);
else
setState(State.CHUNK);
}
@ -1507,6 +1502,20 @@ public class HttpParser
break;
}
case CHUNK_END:
{
// TODO handle chunk trailer
ch=next(buffer);
if (ch==0)
break;
if (ch == HttpTokens.LINE_FEED)
{
setState(State.END);
return _handler.messageComplete();
}
throw new IllegalCharacterException(_state,ch,buffer);
}
case CLOSED:
{
BufferUtil.clear(buffer);

6
jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
View File

@ -582,7 +582,8 @@ public class HttpParserTest
+ "0123456789\015\012"
+ "1a\015\012"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ\015\012"
+ "0\015\012");
+ "0\015\012"
+ "\015\012");
HttpParser.RequestHandler<ByteBuffer> handler = new Handler();
HttpParser parser= new HttpParser(handler);
parseAll(parser,buffer);
@ -594,6 +595,9 @@ public class HttpParserTest
assertEquals("Header1", _hdr[0]);
assertEquals("value1", _val[0]);
assertEquals("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ", _content);
assertTrue(_headerCompleted);
assertTrue(_messageCompleted);
}
@Test