From 4a27c83c04191796113c29ecff151da41646e142 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Mon, 30 Mar 2009 02:19:11 +0000
Subject: [PATCH] Removed code duplication

---
 .../handler/codec/http/HttpChunkAggregator.java | 17 +----------------
 .../handler/codec/http/HttpMessageDecoder.java  |  4 ++++
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
index 73e3f6ed0e..2dd7e3c4b4 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
@@ -65,7 +65,7 @@ public class HttpChunkAggregator extends SimpleChannelUpstreamHandler {
         HttpMessage currentMessage = this.currentMessage;
         if (currentMessage == null) {
             HttpMessage m = (HttpMessage) msg;
-            if (!isContentAlwaysEmpty(m) && m.isChunked()) {
+            if (m.isChunked()) {
                 // A chunked message - remove 'Transfer-Encoding' header,
                 // initialize the cumulative buffer, and wait for incoming chunks.
                 List<String> encodings = m.getHeaders(HttpHeaders.Names.TRANSFER_ENCODING);
@@ -100,19 +100,4 @@ public class HttpChunkAggregator extends SimpleChannelUpstreamHandler {
             }
         }
     }
-
-    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;
-    }
 }
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 36f149254a..dfd90e5f5f 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
@@ -138,6 +138,10 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
                 return message;
             } else if (nextState == State.SKIP_CONTROL_CHARS) {
                 // No content is expected.
+                // Remove the headers which are not supposed to be present not
+                // to confuse subsequent handlers.
+                message.removeHeader(HttpHeaders.Names.CONTENT_LENGTH);
+                message.removeHeader(HttpHeaders.Names.TRANSFER_ENCODING);
                 return message;
             } else {
                 int contentLength = message.getContentLength(-1);