Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions libraries/WebServer/src/WebServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,78 @@ void WebServer::enableETag(bool enable, ETagFunction fn) {
_eTagFunction = fn;
}

void WebServer::chunkResponseBegin(const char* contentType) {
if (_chunkedResponseActive) {
log_e("Already in chunked response mode");
return;
}

if (strchr(contentType, '\r') || strchr(contentType, '\n')) {
log_e("Invalid character in content type");
return;
}

_chunkedResponseActive = true;
_chunkedClient = _currentClient;

_contentLength = CONTENT_LENGTH_UNKNOWN;

String header;
_prepareHeader(header, 200, contentType, 0);
_currentClientWrite(header.c_str(), header.length());

_chunkedResponseActive = true;
_chunkedClient = _currentClient;
}

void WebServer::chunkWrite(const char* data, size_t length) {
if (!_chunkedResponseActive)
{
log_e("Chunked response has not been started");
return;
}

char chunkSize[11];
snprintf(chunkSize, sizeof(chunkSize), "%zx\r\n", length);

if (_chunkedClient.write(chunkSize) != strlen(chunkSize)) {
log_e("Failed to write chunk size");
_chunkedResponseActive = false;
return;
}

if (_chunkedClient.write((const uint8_t*)data, length) != length) {
log_e("Failed to write chunk data");
_chunkedResponseActive = false;
return;
}

if (_chunkedClient.write("\r\n") != 2) {
log_e("Failed to write chunk terminator");
_chunkedResponseActive = false;
return;
}
}

void WebServer::chunkResponseEnd() {
if (!_chunkedResponseActive)
{
log_e("Chunked response has not been started");
return;
}

if (_chunkedClient.write("0\r\n\r\n", 5) != 5) {
log_e("Failed to write terminating chunk");
}

_chunkedClient.flush();
_chunkedResponseActive = false;
_chunked = false;
_chunkedClient = NetworkClient();

_clearResponseHeaders();
}

void WebServer::_prepareHeader(String &response, int code, const char *content_type, size_t contentLength) {
_responseCode = code;

Expand Down
8 changes: 8 additions & 0 deletions libraries/WebServer/src/WebServer.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ class WebServer {
const String AuthTypeDigest = F("Digest");
const String AuthTypeBasic = F("Basic");

void chunkResponseBegin(const char* contentType = "text/plain");
void chunkWrite(const char* data, size_t length);
void chunkResponseEnd();

/* Callbackhandler for authentication. The extra parameters depend on the
* HTTPAuthMethod mode:
*
Expand Down Expand Up @@ -241,6 +245,10 @@ class WebServer {

static String responseCodeToString(int code);

private:
bool _chunkedResponseActive = false;
NetworkClient _chunkedClient; // Store by value, no dangling pointer

protected:
virtual size_t _currentClientWrite(const char *b, size_t l) {
return _currentClient.write(b, l);
Expand Down
Loading