0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Исправлена обработка chunk transfer encoding для случаев, когда конец сообщения в отдельном пакете

Browse Source
This commit is contained in:
serega6531
2020-10-15 01:01:06 +03:00
parent f0fbc2d1a3
commit be43c1d68e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/ru/serega6531/packmate/service/optimization/HttpChunksProcessor.java
View File

@@ -58,7 +58,8 @@ public class HttpChunksProcessor {
}
private void checkCompleteChunk(List<Packet> packets, int start) {
boolean end = BytesUtils.endsWith(packets.get(packets.size() - 1).getContent(), "\r\n0\r\n\r\n".getBytes());
boolean end = Arrays.equals(packets.get(packets.size() - 1).getContent(), "0\r\n\r\n".getBytes()) ||
BytesUtils.endsWith(packets.get(packets.size() - 1).getContent(), "\r\n0\r\n\r\n".getBytes());
if (end) {
processChunk(packets, start);
@@ -122,7 +123,7 @@ public class HttpChunksProcessor {
int c1 = buf.get();
int c2 = buf.get();
if(c1 != '\r' || c2 != '\n') {
if (c1 != '\r' || c2 != '\n') {
log.warn("Failed to merge chunks, chunk trailer is not equal to \\r\\n");
resetChunk();
return false;
@@ -162,7 +163,7 @@ public class HttpChunksProcessor {
if ((b >= '0' && b <= '9') || (b >= 'a' && b <= 'f')) {
sb.append((char) b);
} else if (b == '\r') {
if(buf.get() == '\n') {
if (buf.get() == '\n') {
return Integer.parseInt(sb.toString(), 16);
} else {
return -1; // после \r не идет \n