Merge pull request #1998 from Graylog2/issue-1939

Add Expect: 100-Continue support to HTTP input
Graylog2 · Apr 1, 2016 · 5eb3f93 · 5eb3f93
2 parents a319750 + 0e9a0ba
commit 5eb3f93
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/inputs/transports/HttpTransport.java b/graylog2-server/src/main/java/org/graylog2/inputs/transports/HttpTransport.java
@@ -45,6 +45,7 @@
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelHandler;
 import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
+import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
 import org.jboss.netty.handler.codec.http.HttpContentDecompressor;
 import org.jboss.netty.handler.codec.http.HttpMethod;
 import org.jboss.netty.handler.codec.http.HttpRequest;
@@ -119,6 +120,12 @@ public ChannelHandler call() throws Exception {
                 return new HttpRequestDecoder(DEFAULT_MAX_INITIAL_LINE_LENGTH, DEFAULT_MAX_HEADER_SIZE, maxChunkSize);
             }
         });
+        baseChannelHandlers.put("aggregator", new Callable<ChannelHandler>() {
+            @Override
+            public ChannelHandler call() throws Exception {
+                return new HttpChunkAggregator(maxChunkSize);
+            }
+        });
         baseChannelHandlers.put("encoder", new Callable<ChannelHandler>() {
             @Override
             public ChannelHandler call() throws Exception {