andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#1322] Correctly handle the removal of Transfer-Encoding: chunked in HttpChunkAggregator

Browse Source
This commit is contained in:
Norman Maurer 2013-04-30 20:54:07 +02:00
parent b21b8aef2f
commit a00f9f0b70
3 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
View File

@ -135,11 +135,7 @@ public class HttpChunkAggregator extends SimpleChannelUpstreamHandler implements
if (m.isChunked()) { if (m.isChunked()) {
// A chunked message - remove 'Transfer-Encoding' header, // A chunked message - remove 'Transfer-Encoding' header,
// initialize the cumulative buffer, and wait for incoming chunks. // initialize the cumulative buffer, and wait for incoming chunks.
List<String> encodings = m.getHeaders(HttpHeaders.Names.TRANSFER_ENCODING); HttpCodecUtil.removeTransferEncodingChunked(m);
encodings.remove(HttpHeaders.Values.CHUNKED);
if (encodings.isEmpty()) {
m.removeHeader(HttpHeaders.Names.TRANSFER_ENCODING);
}
m.setChunked(false); m.setChunked(false);
this.currentMessage = m; this.currentMessage = m;
} else { } else {

18
src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java
View File

@ -15,6 +15,7 @@
*/ */
package org.jboss.netty.handler.codec.http; package org.jboss.netty.handler.codec.http;
import java.util.Iterator;
import java.util.List; import java.util.List;
final class HttpCodecUtil { final class HttpCodecUtil {
@ -120,8 +121,21 @@ final class HttpCodecUtil {
static void removeTransferEncodingChunked(HttpMessage m) { static void removeTransferEncodingChunked(HttpMessage m) {
List<String> values = m.getHeaders(HttpHeaders.Names.TRANSFER_ENCODING); List<String> values = m.getHeaders(HttpHeaders.Names.TRANSFER_ENCODING);
values.remove(HttpHeaders.Values.CHUNKED); if (values.isEmpty()) {
m.setHeader(HttpHeaders.Names.TRANSFER_ENCODING, values); return;
}
Iterator<String> valuesIt = values.iterator();
while (valuesIt.hasNext()) {
String value = valuesIt.next();
if (value.equalsIgnoreCase(HttpHeaders.Values.CHUNKED)) {
valuesIt.remove();
}
}
if (values.isEmpty()) {
m.removeHeader(HttpHeaders.Names.TRANSFER_ENCODING);
} else {
m.setHeader(HttpHeaders.Names.TRANSFER_ENCODING, values);
}
} }
static boolean isContentLengthSet(HttpMessage m) { static boolean isContentLengthSet(HttpMessage m) {

27
src/test/java/org/jboss/netty/handler/codec/http/HttpChunkAggregatorTest.java
View File

@ -139,4 +139,31 @@ public class HttpChunkAggregatorTest {
aggr.beforeAdd(ctx); aggr.beforeAdd(ctx);
aggr.setMaxCumulationBufferComponents(10); aggr.setMaxCumulationBufferComponents(10);
} }
@Test
public void testAggregateTransferEncodingChunked() {
HttpChunkAggregator aggr = new HttpChunkAggregator(1024 * 1024);
DecoderEmbedder<HttpMessage> embedder = new DecoderEmbedder<HttpMessage>(aggr);
HttpMessage message = new DefaultHttpMessage(HttpVersion.HTTP_1_1);
HttpHeaders.setHeader(message, "X-Test", true);
HttpHeaders.setHeader(message, "Transfer-Encoding", "Chunked");
message.setChunked(true);
HttpChunk chunk1 = new DefaultHttpChunk(ChannelBuffers.copiedBuffer("test", CharsetUtil.US_ASCII));
HttpChunk chunk2 = new DefaultHttpChunk(ChannelBuffers.copiedBuffer("test2", CharsetUtil.US_ASCII));
HttpChunk chunk3 = new DefaultHttpChunk(ChannelBuffers.EMPTY_BUFFER);
assertFalse(embedder.offer(message));
assertFalse(embedder.offer(chunk1));
assertFalse(embedder.offer(chunk2));
// this should trigger a messageReceived event so return true
assertTrue(embedder.offer(chunk3));
assertTrue(embedder.finish());
HttpMessage aggratedMessage = embedder.poll();
assertNotNull(aggratedMessage);
assertEquals(chunk1.getContent().readableBytes() + chunk2.getContent().readableBytes(), HttpHeaders.getContentLength(aggratedMessage));
assertEquals(aggratedMessage.getHeader("X-Test"), Boolean.TRUE.toString());
checkContentBuffer(aggratedMessage);
assertNull(embedder.poll());
}
} }