Merged branch 'jetty-9.4.x' into 'master'.

This commit is contained in:
Simone Bordet 2017-10-03 10:19:41 +02:00
commit 22e9c5a7bf
2 changed files with 0 additions and 3 deletions

View File

@ -22,11 +22,9 @@ import org.eclipse.jetty.io.ByteBufferPool;
/** /**
* {@link ContentDecoder} for the "gzip" encoding. * {@link ContentDecoder} for the "gzip" encoding.
*
*/ */
public class GZIPContentDecoder extends org.eclipse.jetty.http.GZIPContentDecoder implements ContentDecoder public class GZIPContentDecoder extends org.eclipse.jetty.http.GZIPContentDecoder implements ContentDecoder
{ {
private static final int DEFAULT_BUFFER_SIZE = 2048; private static final int DEFAULT_BUFFER_SIZE = 2048;
public GZIPContentDecoder() public GZIPContentDecoder()

View File

@ -101,7 +101,6 @@ public class GZIPContentDecoder implements Destroyable
if (size<=_inflated.capacity()) if (size<=_inflated.capacity())
{ {
BufferUtil.append(_inflated,chunk); BufferUtil.append(_inflated,chunk);
BufferUtil.put(chunk,_inflated);
release(chunk); release(chunk);
} }
else else