Merge pull request #934 from jpinner/fix_spdy_regression_master
SPDY: fix regression in SpdyFrameDecoder.decodeHeaderBlock()
This commit is contained in:
commit
c20d875817
@ -578,7 +578,7 @@ public class SpdyFrameDecoder extends ByteToMessageDecoder {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
while (numHeaders -- > 0) {
|
while (numHeaders > 0) {
|
||||||
int headerSize = this.headerSize;
|
int headerSize = this.headerSize;
|
||||||
decompressed.markReaderIndex();
|
decompressed.markReaderIndex();
|
||||||
|
|
||||||
@ -638,6 +638,7 @@ public class SpdyFrameDecoder extends ByteToMessageDecoder {
|
|||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
spdyHeaderBlock.addHeader(name, "");
|
spdyHeaderBlock.addHeader(name, "");
|
||||||
|
numHeaders --;
|
||||||
this.headerSize = headerSize;
|
this.headerSize = headerSize;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -683,6 +684,7 @@ public class SpdyFrameDecoder extends ByteToMessageDecoder {
|
|||||||
index ++;
|
index ++;
|
||||||
offset = index;
|
offset = index;
|
||||||
}
|
}
|
||||||
|
numHeaders --;
|
||||||
this.headerSize = headerSize;
|
this.headerSize = headerSize;
|
||||||
}
|
}
|
||||||
decompressed = null;
|
decompressed = null;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user