SPDY: use java.util.zip for header block decompressor
This commit is contained in:
parent
cf02ad2a1e
commit
304eee1db4
|
@ -66,6 +66,16 @@ public class SpdyFrameDecoder extends FrameDecoder {
|
||||||
this.maxHeaderSize = maxHeaderSize;
|
this.maxHeaderSize = maxHeaderSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Object decodeLast(
|
||||||
|
ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer)
|
||||||
|
throws Exception {
|
||||||
|
Object frame = decode(ctx, channel, buffer);
|
||||||
|
headerBlockDecompressor.end();
|
||||||
|
return frame;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Object decode(
|
protected Object decode(
|
||||||
ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer)
|
ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer)
|
||||||
|
|
|
@ -20,9 +20,10 @@ import io.netty.buffer.ChannelBuffer;
|
||||||
abstract class SpdyHeaderBlockDecompressor {
|
abstract class SpdyHeaderBlockDecompressor {
|
||||||
|
|
||||||
static SpdyHeaderBlockDecompressor newInstance() {
|
static SpdyHeaderBlockDecompressor newInstance() {
|
||||||
return new SpdyHeaderBlockJZlibDecompressor();
|
return new SpdyHeaderBlockZlibDecompressor();
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract void setInput(ChannelBuffer compressed);
|
abstract void setInput(ChannelBuffer compressed);
|
||||||
abstract void decode(ChannelBuffer decompressed);
|
abstract void decode(ChannelBuffer decompressed) throws Exception;
|
||||||
|
abstract void end();
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,4 +86,11 @@ class SpdyHeaderBlockJZlibDecompressor extends SpdyHeaderBlockDecompressor {
|
||||||
decompressed.writeBytes(out, 0, z.next_out_index);
|
decompressed.writeBytes(out, 0, z.next_out_index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void end() {
|
||||||
|
z.inflateEnd();
|
||||||
|
z.next_in = null;
|
||||||
|
z.next_out = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,59 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you under the Apache License,
|
||||||
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at:
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
package org.jboss.netty.handler.codec.spdy;
|
||||||
|
|
||||||
|
import java.util.zip.DataFormatException;
|
||||||
|
import java.util.zip.Inflater;
|
||||||
|
|
||||||
|
import org.jboss.netty.buffer.ChannelBuffer;
|
||||||
|
|
||||||
|
import static org.jboss.netty.handler.codec.spdy.SpdyCodecUtil.*;
|
||||||
|
|
||||||
|
class SpdyHeaderBlockZlibDecompressor extends SpdyHeaderBlockDecompressor {
|
||||||
|
|
||||||
|
private final byte[] out = new byte[8192];
|
||||||
|
private final Inflater decompressor = new Inflater();
|
||||||
|
|
||||||
|
public SpdyHeaderBlockZlibDecompressor() {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setInput(ChannelBuffer compressed) {
|
||||||
|
byte[] in = new byte[compressed.readableBytes()];
|
||||||
|
compressed.readBytes(in);
|
||||||
|
decompressor.setInput(in);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void decode(ChannelBuffer decompressed) throws Exception {
|
||||||
|
try {
|
||||||
|
int numBytes = decompressor.inflate(out);
|
||||||
|
if (numBytes == 0 && decompressor.needsDictionary()) {
|
||||||
|
decompressor.setDictionary(SPDY_DICT);
|
||||||
|
numBytes = decompressor.inflate(out);
|
||||||
|
}
|
||||||
|
decompressed.writeBytes(out, 0, numBytes);
|
||||||
|
} catch (DataFormatException e) {
|
||||||
|
throw new SpdyProtocolException(
|
||||||
|
"Received invalid header block");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void end() {
|
||||||
|
decompressor.end();
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user