adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(webserver): Cap size of last chunk in raw read in WebServer

Browse source 
Before, the raw read would time out if the content length was not a multiple
of HTTP_RAW_BUFLEN, as it tried to read HTTP_RAW_BUFLEN bytes even if the
last chunk should actually contain less.
This commit is contained in:
Marcos Del Sol Vives 2024-12-13 02:55:30 +01:00
parent fb6e977aa8
commit 784ef0f286
No known key found for this signature in database
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/WebServer/src/Parsing.cpp
View file

@ -186,8 +186,12 @@ bool WebServer::_parseRequest(NetworkClient &client) {
_currentHandler->raw(*this, _currentUri, *_currentRaw); _currentHandler->raw(*this, _currentUri, *_currentRaw);
_currentRaw->status = RAW_WRITE; _currentRaw->status = RAW_WRITE;
while (_currentRaw->totalSize < _clientContentLength) { while (1) {
_currentRaw->currentSize = client.readBytes(_currentRaw->buf, HTTP_RAW_BUFLEN); size_t read_len = std::min(_clientContentLength - _currentRaw->totalSize, (size_t) HTTP_RAW_BUFLEN);
if (read_len == 0) {
break;
}
_currentRaw->currentSize = client.readBytes(_currentRaw->buf, read_len);
_currentRaw->totalSize += _currentRaw->currentSize; _currentRaw->totalSize += _currentRaw->currentSize;
if (_currentRaw->currentSize == 0) { if (_currentRaw->currentSize == 0) {
_currentRaw->status = RAW_ABORTED; _currentRaw->status = RAW_ABORTED;