From 90bb7480917dff563750941fe99fc620cb78163f Mon Sep 17 00:00:00 2001 From: Ryan Downing <26515643+r-downing@users.noreply.github.com> Date: Sat, 16 Jul 2022 01:04:15 -0400 Subject: [PATCH] added http code param to WebServer.streamFile (#6899) --- libraries/WebServer/src/WebServer.cpp | 4 ++-- libraries/WebServer/src/WebServer.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/WebServer/src/WebServer.cpp b/libraries/WebServer/src/WebServer.cpp index bad6e73a80e..2acc8acb9e4 100644 --- a/libraries/WebServer/src/WebServer.cpp +++ b/libraries/WebServer/src/WebServer.cpp @@ -527,7 +527,7 @@ void WebServer::sendContent_P(PGM_P content, size_t size) { } -void WebServer::_streamFileCore(const size_t fileSize, const String & fileName, const String & contentType) +void WebServer::_streamFileCore(const size_t fileSize, const String & fileName, const String & contentType, const int code) { using namespace mime; setContentLength(fileSize); @@ -536,7 +536,7 @@ void WebServer::_streamFileCore(const size_t fileSize, const String & fileName, contentType != String(FPSTR(mimeTable[none].mimeType))) { sendHeader(F("Content-Encoding"), F("gzip")); } - send(200, contentType, ""); + send(code, contentType, ""); } String WebServer::pathArg(unsigned int i) { diff --git a/libraries/WebServer/src/WebServer.h b/libraries/WebServer/src/WebServer.h index 4a212678f92..e0a92a46ee8 100644 --- a/libraries/WebServer/src/WebServer.h +++ b/libraries/WebServer/src/WebServer.h @@ -139,8 +139,8 @@ class WebServer static String urlDecode(const String& text); template - size_t streamFile(T &file, const String& contentType) { - _streamFileCore(file.size(), file.name(), contentType); + size_t streamFile(T &file, const String& contentType, const int code = 200) { + _streamFileCore(file.size(), file.name(), contentType, code); return _currentClient.write(file); } @@ -160,7 +160,7 @@ class WebServer void _prepareHeader(String& response, int code, const char* content_type, size_t contentLength); bool _collectHeader(const char* headerName, const char* headerValue); - void _streamFileCore(const size_t fileSize, const String & fileName, const String & contentType); + void _streamFileCore(const size_t fileSize, const String & fileName, const String & contentType, const int code = 200); String _getRandomHexString(); // for extracting Auth parameters