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

[#2005] Allow to use HttpContentDecompressor in strict mode

Browse Source
This commit is contained in:
Norman Maurer 2013-11-26 08:20:56 +01:00
parent fd4435e6e3
commit 04e8d25792
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java
View File

@ -25,14 +25,40 @@ import io.netty.handler.codec.compression.ZlibWrapper;
* handler modifies the message, please refer to {@link HttpContentDecoder}.
*/
public class HttpContentDecompressor extends HttpContentDecoder {
private final boolean strict;
/**
* Create a new {@link HttpContentDecompressor} in non-strict mode.
*/
public HttpContentDecompressor() {
this(false);
}
/**
* Create a new {@link HttpContentDecompressor}.
*
* @param strict if {@code true} use strict handling of deflate if used, otherwise handle it in a
* more lenient fashion.
*/
public HttpContentDecompressor(boolean strict) {
this.strict = strict;
}
@Override
protected EmbeddedChannel newContentDecoder(String contentEncoding) throws Exception {
if ("gzip".equalsIgnoreCase(contentEncoding) || "x-gzip".equalsIgnoreCase(contentEncoding)) {
return new EmbeddedChannel(ZlibCodecFactory.newZlibDecoder(ZlibWrapper.GZIP));
}
if ("deflate".equalsIgnoreCase(contentEncoding) || "x-deflate".equalsIgnoreCase(contentEncoding)) {
ZlibWrapper wrapper;
if (strict) {
wrapper = ZlibWrapper.ZLIB;
} else {
wrapper = ZlibWrapper.ZLIB_OR_NONE;
}
// To be strict, 'deflate' means ZLIB, but some servers were not implemented correctly.
return new EmbeddedChannel(ZlibCodecFactory.newZlibDecoder(ZlibWrapper.ZLIB_OR_NONE));
return new EmbeddedChannel(ZlibCodecFactory.newZlibDecoder(wrapper));
}
// 'identity' or unsupported