SPDY: fix pushed response NullPointerException

profer · Jul 21, 2014 · 6935c07 · 6935c07
1 parent 860e475
commit 6935c07
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpDecoder.java
@@ -146,6 +146,7 @@ protected void decode(ChannelHandlerContext ctx, SpdyFrame msg, List<Object> out
                 }
 
                 String URL = spdySynStreamFrame.headers().get(PATH);
+                spdySynStreamFrame.headers().remove(PATH);
 
                 // If a client receives a SYN_STREAM without a 'url' header
                 // it must reply with a RST_STREAM with error code PROTOCOL_ERROR
@@ -338,12 +339,10 @@ private static FullHttpRequest createHttpRequest(int spdyVersion, SpdyHeadersFra
         // Remove the scheme header
         headers.remove(SCHEME);
 
-        if (spdyVersion >= 3) {
-            // Replace the SPDY host header with the HTTP host header
-            String host = headers.get(HOST);
-            headers.remove(HOST);
-            req.headers().set(HttpHeaders.Names.HOST, host);
-        }
+        // Replace the SPDY host header with the HTTP host header
+        String host = headers.get(HOST);
+        headers.remove(HOST);
+        req.headers().set(HttpHeaders.Names.HOST, host);
 
         for (Map.Entry<String, String> e: requestFrame.headers()) {
             req.headers().add(e.getKey(), e.getValue());