andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issue: NETTY-137 HttpChunkAggregator should not wait for content when the response status code implies empty content.

Browse Source 
* Applied the same fix to HttpMessageDecoder
This commit is contained in:
Trustin Lee 2009-03-30 02:14:11 +00:00
parent c511ff9872
commit c6b707c442
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
View File

@ -136,6 +136,9 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
// Chunked encoding // Chunked encoding
// Generate HttpMessage first. HttpChunks will follow. // Generate HttpMessage first. HttpChunks will follow.
return message; return message;
} else if (nextState == State.SKIP_CONTROL_CHARS) {
// No content is expected.
return message;
} else { } else {
int contentLength = message.getContentLength(-1); int contentLength = message.getContentLength(-1);
if (contentLength == 0 || contentLength == -1 && isDecodingRequest()) { if (contentLength == 0 || contentLength == -1 && isDecodingRequest()) {
@ -301,6 +304,22 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
} }
} }
protected boolean isContentAlwaysEmpty(HttpMessage msg) {
if (msg instanceof HttpResponse) {
HttpResponse res = (HttpResponse) msg;
int code = res.getStatus().getCode();
if (code < 200) {
return true;
}
switch (code) {
case 204: case 205: case 304:
return true;
}
}
return false;
}
private Object reset() { private Object reset() {
HttpMessage message = this.message; HttpMessage message = this.message;
ChannelBuffer content = this.content; ChannelBuffer content = this.content;
@ -356,7 +375,10 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
} }
State nextState; State nextState;
if (message.isChunked()) {
if (isContentAlwaysEmpty(message)) {
nextState = State.SKIP_CONTROL_CHARS;
} else if (message.isChunked()) {
nextState = State.READ_CHUNK_SIZE; nextState = State.READ_CHUNK_SIZE;
} else if (message.getContentLength(-1) >= 0) { } else if (message.getContentLength(-1) >= 0) {
nextState = State.READ_FIXED_LENGTH_CONTENT; nextState = State.READ_FIXED_LENGTH_CONTENT;