feedc0de/ESPAsyncWebServer
1
0
Fork 0
forked from me-no-dev/ESPAsyncWebServer
Code Pull Requests Activity

attempt fix on some edge cases

Browse Source 
attempt to fix a case where \r can be missed and post not parsed
correctly
This commit is contained in:
Me No Dev
2016-05-20 00:55:19 +03:00
parent b64691d4f7
commit 8171edd7e1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/WebRequest.cpp
View File

@@ -426,21 +426,21 @@ void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
} else if(_multiParseState == EXPECT_FEED1){ } else if(_multiParseState == EXPECT_FEED1){
if(data != '\n'){ if(data != '\n'){
_multiParseState = WAIT_FOR_RETURN1; _multiParseState = WAIT_FOR_RETURN1;
itemWriteByte('\r'); itemWriteByte(data); itemWriteByte('\r'); _parseMultipartPostByte(data, last);
} else { } else {
_multiParseState = EXPECT_DASH1; _multiParseState = EXPECT_DASH1;
} }
} else if(_multiParseState == EXPECT_DASH1){ } else if(_multiParseState == EXPECT_DASH1){
if(data != '-'){ if(data != '-'){
_multiParseState = WAIT_FOR_RETURN1; _multiParseState = WAIT_FOR_RETURN1;
itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte(data); itemWriteByte('\r'); itemWriteByte('\n'); _parseMultipartPostByte(data, last);
} else { } else {
_multiParseState = EXPECT_DASH2; _multiParseState = EXPECT_DASH2;
} }
} else if(_multiParseState == EXPECT_DASH2){ } else if(_multiParseState == EXPECT_DASH2){
if(data != '-'){ if(data != '-'){
_multiParseState = WAIT_FOR_RETURN1; _multiParseState = WAIT_FOR_RETURN1;
itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-'); itemWriteByte(data); itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-'); _parseMultipartPostByte(data, last);
} else { } else {
_multiParseState = BOUNDARY_OR_DATA; _multiParseState = BOUNDARY_OR_DATA;
_boundaryPosition = 0; _boundaryPosition = 0;
@@ -452,7 +452,7 @@ void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
uint8_t i; uint8_t i;
for(i=0; i<_boundaryPosition; i++) for(i=0; i<_boundaryPosition; i++)
itemWriteByte(_boundary.c_str()[i]); itemWriteByte(_boundary.c_str()[i]);
itemWriteByte(data); _parseMultipartPostByte(data, last);
} else if(_boundaryPosition == _boundary.length() - 1){ } else if(_boundaryPosition == _boundary.length() - 1){
_multiParseState = DASH3_OR_RETURN2; _multiParseState = DASH3_OR_RETURN2;
if(!_itemIsFile){ if(!_itemIsFile){
@@ -482,7 +482,7 @@ void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
_multiParseState = WAIT_FOR_RETURN1; _multiParseState = WAIT_FOR_RETURN1;
itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-'); itemWriteByte('-'); itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-'); itemWriteByte('-');
uint8_t i; for(i=0; i<_boundary.length(); i++) itemWriteByte(_boundary.c_str()[i]); uint8_t i; for(i=0; i<_boundary.length(); i++) itemWriteByte(_boundary.c_str()[i]);
itemWriteByte(data); _parseMultipartPostByte(data, last);
} }
} else if(_multiParseState == EXPECT_FEED2){ } else if(_multiParseState == EXPECT_FEED2){
if(data == '\n'){ if(data == '\n'){
@@ -492,7 +492,7 @@ void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
_multiParseState = WAIT_FOR_RETURN1; _multiParseState = WAIT_FOR_RETURN1;
itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-'); itemWriteByte('-'); itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-'); itemWriteByte('-');
uint8_t i; for(i=0; i<_boundary.length(); i++) itemWriteByte(_boundary.c_str()[i]); uint8_t i; for(i=0; i<_boundary.length(); i++) itemWriteByte(_boundary.c_str()[i]);
itemWriteByte('\r'); itemWriteByte(data); itemWriteByte('\r'); _parseMultipartPostByte(data, last);
} }
} }
} }