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

SPDY: SpdyHeaderBlockDecoder should not discard input data

Browse Source
This commit is contained in:
Jeff Pinner 2013-06-28 13:33:14 -07:00 committed by Trustin Lee
parent 4dab51b619
commit 0c8cf5cdc8
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockRawDecoder.java
View File

@ -81,7 +81,6 @@ public class SpdyHeaderBlockRawDecoder extends SpdyHeaderBlockDecoder {
// Try to read length of name // Try to read length of name
if (encoded.readableBytes() < lengthFieldSize) { if (encoded.readableBytes() < lengthFieldSize) {
encoded.resetReaderIndex(); encoded.resetReaderIndex();
encoded.discardReadBytes();
return; return;
} }
int nameLength = readLengthField(encoded); int nameLength = readLengthField(encoded);
@ -100,7 +99,6 @@ public class SpdyHeaderBlockRawDecoder extends SpdyHeaderBlockDecoder {
// Try to read name // Try to read name
if (encoded.readableBytes() < nameLength) { if (encoded.readableBytes() < nameLength) {
encoded.resetReaderIndex(); encoded.resetReaderIndex();
encoded.discardReadBytes();
return; return;
} }
byte[] nameBytes = new byte[nameLength]; byte[] nameBytes = new byte[nameLength];
@ -116,7 +114,6 @@ public class SpdyHeaderBlockRawDecoder extends SpdyHeaderBlockDecoder {
// Try to read length of value // Try to read length of value
if (encoded.readableBytes() < lengthFieldSize) { if (encoded.readableBytes() < lengthFieldSize) {
encoded.resetReaderIndex(); encoded.resetReaderIndex();
encoded.discardReadBytes();
return; return;
} }
int valueLength = readLengthField(encoded); int valueLength = readLengthField(encoded);
@ -149,7 +146,6 @@ public class SpdyHeaderBlockRawDecoder extends SpdyHeaderBlockDecoder {
// Try to read value // Try to read value
if (encoded.readableBytes() < valueLength) { if (encoded.readableBytes() < valueLength) {
encoded.resetReaderIndex(); encoded.resetReaderIndex();
encoded.discardReadBytes();
return; return;
} }
byte[] valueBytes = new byte[valueLength]; byte[] valueBytes = new byte[valueLength];

1
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockZlibDecoder.java
View File

@ -69,6 +69,7 @@ class SpdyHeaderBlockZlibDecoder extends SpdyHeaderBlockRawDecoder {
if (frame != null) { if (frame != null) {
decompressed.writeBytes(out, 0, numBytes); decompressed.writeBytes(out, 0, numBytes);
super.decode(decompressed, frame); super.decode(decompressed, frame);
decompressed.discardReadBytes();
} }
return numBytes; return numBytes;
} catch (DataFormatException e) { } catch (DataFormatException e) {