Also allow to disable header validation via HttpServerCodec and HttpClientCodec. Related to [netty#1981]

Norman Maurer · Norman Maurer · commit 8bfbf77b5898 · 2013-11-14T08:19:49.000+01:00
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java
@@ -76,9 +76,21 @@ public HttpClientCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunk
         this(maxInitialLineLength, maxHeaderSize, maxChunkSize, false);
     }
 
+    /**
+     * Creates a new instance with the specified decoder options.
+     */
     public HttpClientCodec(
             int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean failOnMissingResponse) {
-        init(new Decoder(maxInitialLineLength, maxHeaderSize, maxChunkSize), new Encoder());
+        this(maxInitialLineLength, maxHeaderSize, maxChunkSize, failOnMissingResponse, true);
+    }
+
+    /**
+     * Creates a new instance with the specified decoder options.
+     */
+    public HttpClientCodec(
+            int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean failOnMissingResponse,
+            boolean validateHeaders) {
+        init(new Decoder(maxInitialLineLength, maxHeaderSize, maxChunkSize, validateHeaders), new Encoder());
         this.failOnMissingResponse = failOnMissingResponse;
     }
 
@@ -104,8 +116,8 @@ protected void encode(
     }
 
     private final class Decoder extends HttpResponseDecoder {
-        Decoder(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize) {
-            super(maxInitialLineLength, maxHeaderSize, maxChunkSize);
+        Decoder(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean validateHeaders) {
+            super(maxInitialLineLength, maxHeaderSize, maxChunkSize, validateHeaders);
         }
 
         @Override
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java
@@ -42,4 +42,12 @@ public HttpServerCodec() {
     public HttpServerCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize) {
         super(new HttpRequestDecoder(maxInitialLineLength, maxHeaderSize, maxChunkSize), new HttpResponseEncoder());
     }
+
+    /**
+     * Creates a new instance with the specified decoder options.
+     */
+    public HttpServerCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean validateHeaders) {
+        super(new HttpRequestDecoder(maxInitialLineLength, maxHeaderSize, maxChunkSize, validateHeaders),
+                new HttpResponseEncoder());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,12 @@ public HttpServerCodec() {`
`42`	`42`	`public HttpServerCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize) {`
`43`	`43`	`super(new HttpRequestDecoder(maxInitialLineLength, maxHeaderSize, maxChunkSize), new HttpResponseEncoder());`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+ /**`
	`47`	`+ * Creates a new instance with the specified decoder options.`
	`48`	`+ */`
	`49`	`+ public HttpServerCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean validateHeaders) {`
	`50`	`+ super(new HttpRequestDecoder(maxInitialLineLength, maxHeaderSize, maxChunkSize, validateHeaders),`
	`51`	`+ new HttpResponseEncoder());`
	`52`	`+ }`
`45`	`53`	`}`