From c6b707c442b9116b26a99fac16cd067c27628ae2 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Mon, 30 Mar 2009 02:14:11 +0000
Subject: [PATCH] Fixed issue: NETTY-137 HttpChunkAggregator should not wait
 for content when the response status code implies empty content. * Applied
 the same fix to HttpMessageDecoder

---
 .../codec/http/HttpMessageDecoder.java        | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
index 351576195c..36f149254a 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
@@ -136,6 +136,9 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
                 // Chunked encoding
                 // Generate HttpMessage first.  HttpChunks will follow.
                 return message;
+            } else if (nextState == State.SKIP_CONTROL_CHARS) {
+                // No content is expected.
+                return message;
             } else {
                 int contentLength = message.getContentLength(-1);
                 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() {
         HttpMessage message = this.message;
         ChannelBuffer content = this.content;
@@ -356,7 +375,10 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
         }
 
         State nextState;
-        if (message.isChunked()) {
+
+        if (isContentAlwaysEmpty(message)) {
+            nextState = State.SKIP_CONTROL_CHARS;
+        } else if (message.isChunked()) {
             nextState = State.READ_CHUNK_SIZE;
         } else if (message.getContentLength(-1) >= 0) {
             nextState = State.READ_FIXED_LENGTH_CONTENT;