From 279d859c7ef09f69a64f2a7627660cdfe008fe9c Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Fri, 9 Mar 2012 11:07:26 +0900
Subject: [PATCH] Issue #220 - Treat content as non-empty on 101 Web Socket
 upgrade response

---
 .../handler/codec/http/HttpMessageDecoder.java      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
index cb82652f99..e0a5a40f0b 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
@@ -368,12 +368,17 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
         if (msg instanceof HttpResponse) {
             HttpResponse res = (HttpResponse) msg;
             int code = res.getStatus().getCode();
-            // also check for code of 101 as 101 == Response to a websockets upgrade in earlier websocket versions.
-            //
-            // See https://github.com/netty/netty/issues/222
-            if (code < 200 && code != 101) {
+            if (code < 200) {
+                // Old Web Socket upgrade response had 16-byte fixed length content.
+                // See https://github.com/netty/netty/issues/222
+                if (code == 101 &&
+                    res.containsHeader(HttpHeaders.Names.SEC_WEBSOCKET_ORIGIN) &&
+                    res.containsHeader(HttpHeaders.Names.SEC_WEBSOCKET_LOCATION)) {
+                    return false;
+                }
                 return true;
             }
+
             switch (code) {
             case 204: case 205: case 304:
                 return true;