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

Fix line-end detection for binary streams upload

Browse Source 
- Related: #1017 (and #1016)
This commit is contained in:
ursa 2013-02-05 19:07:31 +04:00 committed by Trustin Lee
parent bea8851a58
commit db502cea4c
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/jboss/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java
View File

@ -1517,6 +1517,12 @@ public class HttpPostRequestDecoder {
newLine = true; newLine = true;
index = 0; index = 0;
lastPosition = undecodedChunk.readerIndex() - 2; lastPosition = undecodedChunk.readerIndex() - 2;
} else {
// save last valid position
lastPosition = undecodedChunk.readerIndex() - 1;
// Unread next byte.
undecodedChunk.readerIndex(lastPosition);
} }
} }
} else if (nextByte == HttpConstants.LF) { } else if (nextByte == HttpConstants.LF) {
@ -1537,6 +1543,12 @@ public class HttpPostRequestDecoder {
newLine = true; newLine = true;
index = 0; index = 0;
lastPosition = undecodedChunk.readerIndex() - 2; lastPosition = undecodedChunk.readerIndex() - 2;
} else {
// save last valid position
lastPosition = undecodedChunk.readerIndex() - 1;
// Unread next byte.
undecodedChunk.readerIndex(lastPosition);
} }
} }
} else if (nextByte == HttpConstants.LF) { } else if (nextByte == HttpConstants.LF) {
@ -1619,6 +1631,12 @@ public class HttpPostRequestDecoder {
newLine = true; newLine = true;
index = 0; index = 0;
lastrealpos = sao.pos - 2; lastrealpos = sao.pos - 2;
} else {
// unread next byte
sao.pos--;
// save last valid position
lastrealpos = sao.pos;
} }
} }
} else if (nextByte == HttpConstants.LF) { } else if (nextByte == HttpConstants.LF) {
@ -1639,6 +1657,12 @@ public class HttpPostRequestDecoder {
newLine = true; newLine = true;
index = 0; index = 0;
lastrealpos = sao.pos - 2; lastrealpos = sao.pos - 2;
} else {
// unread next byte
sao.pos--;
// save last valid position
lastrealpos = sao.pos;
} }
} }
} else if (nextByte == HttpConstants.LF) { } else if (nextByte == HttpConstants.LF) {