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

Fixed a bug where trailing headers are not written

Browse Source
This commit is contained in:
Trustin Lee 2009-11-17 07:31:35 +00:00
parent cfd3421234
commit 2dab484372
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java
View File

@ -83,6 +83,14 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
HttpChunk chunk = (HttpChunk) msg; HttpChunk chunk = (HttpChunk) msg;
if (chunk == HttpChunk.LAST_CHUNK) { if (chunk == HttpChunk.LAST_CHUNK) {
return LAST_CHUNK.duplicate(); return LAST_CHUNK.duplicate();
} else if (chunk instanceof HttpChunkTrailer) {
ChannelBuffer trailer = ChannelBuffers.dynamicBuffer(
channel.getConfig().getBufferFactory());
trailer.writeByte((byte) '0');
trailer.writeBytes(CRLF);
encodeTrailingHeaders(trailer, (HttpChunkTrailer) chunk);
trailer.writeBytes(CRLF);
return trailer;
} else { } else {
ChannelBuffer content = chunk.getContent(); ChannelBuffer content = chunk.getContent();
int contentLength = content.readableBytes(); int contentLength = content.readableBytes();
@ -105,12 +113,7 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
for (String header : headers) { for (String header : headers) {
List<String> values = message.getHeaders(header); List<String> values = message.getHeaders(header);
for (String value : values) { for (String value : values) {
encodeHeader(buf, header, value);
buf.writeBytes(header.getBytes("ASCII"));
buf.writeByte(COLON);
buf.writeByte(SP);
buf.writeBytes(value.getBytes("ASCII"));
buf.writeBytes(CRLF);
} }
} }
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
@ -118,5 +121,28 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
} }
} }
private void encodeTrailingHeaders(ChannelBuffer buf, HttpChunkTrailer trailer) {
Set<String> headers = trailer.getHeaderNames();
try {
for (String header : headers) {
List<String> values = trailer.getHeaders(header);
for (String value : values) {
encodeHeader(buf, header, value);
}
}
} catch (UnsupportedEncodingException e) {
throw (Error) new Error().initCause(e);
}
}
private void encodeHeader(ChannelBuffer buf, String header, String value)
throws UnsupportedEncodingException {
buf.writeBytes(header.getBytes("ASCII"));
buf.writeByte(COLON);
buf.writeByte(SP);
buf.writeBytes(value.getBytes("ASCII"));
buf.writeBytes(CRLF);
}
protected abstract void encodeInitialLine(ChannelBuffer buf, HttpMessage message) throws Exception; protected abstract void encodeInitialLine(ChannelBuffer buf, HttpMessage message) throws Exception;
} }