diff --git a/lib/ESPAsyncWebServer/src/WebRequest.cpp b/lib/ESPAsyncWebServer/src/WebRequest.cpp index bfc74579d..36ec08faa 100644 --- a/lib/ESPAsyncWebServer/src/WebRequest.cpp +++ b/lib/ESPAsyncWebServer/src/WebRequest.cpp @@ -855,12 +855,6 @@ AsyncWebServerResponse * AsyncWebServerRequest::beginResponse_P(int code, const return beginResponse_P(code, contentType, (const uint8_t *)content, strlen_P(content), callback); } -// added by proddy -AsyncWebServerResponse * -AsyncWebServerRequest::beginResponse(const String & contentType, const uint8_t * content, size_t len) { - return new AsyncResponse(contentType, content, len); -} - void AsyncWebServerRequest::send(int code, const String & contentType, const String & content) { send(beginResponse(code, contentType, content)); } diff --git a/lib/ESPAsyncWebServer/src/WebResponseImpl.h b/lib/ESPAsyncWebServer/src/WebResponseImpl.h index 6285c0c36..a0ca90c75 100644 --- a/lib/ESPAsyncWebServer/src/WebResponseImpl.h +++ b/lib/ESPAsyncWebServer/src/WebResponseImpl.h @@ -145,20 +145,6 @@ class AsyncProgmemResponse : public AsyncAbstractResponse { virtual size_t _fillBuffer(uint8_t * buf, size_t maxLen) override; }; -// added by proddy -class AsyncResponse : public AsyncAbstractResponse { - private: - const uint8_t * _content; - size_t _readLength; - - public: - AsyncResponse(const String & contentType, const uint8_t * content, size_t len); - bool _sourceValid() const { - return true; - } - virtual size_t _fillBuffer(uint8_t * buf, size_t maxLen) override; -}; - class cbuf; class AsyncResponseStream : public AsyncAbstractResponse, public Print { diff --git a/lib/ESPAsyncWebServer/src/WebResponses.cpp b/lib/ESPAsyncWebServer/src/WebResponses.cpp index 07d0ef98c..5bdceab50 100644 --- a/lib/ESPAsyncWebServer/src/WebResponses.cpp +++ b/lib/ESPAsyncWebServer/src/WebResponses.cpp @@ -746,20 +746,6 @@ size_t AsyncProgmemResponse::_fillBuffer(uint8_t * data, size_t len) { return left; } -// added by proddy -AsyncResponse::AsyncResponse(const String & contentType, const uint8_t * content, size_t len) - : AsyncAbstractResponse(nullptr) { - _code = 200; - _content = content; - _contentType = contentType; - _contentLength = len; - _readLength = len; -} -size_t AsyncResponse::_fillBuffer(uint8_t * data, size_t len) { - memcpy(data, _content, len); - return len; -} - /* * Response Stream (You can print/write/printf to it, up to the contentLen bytes) * */ diff --git a/lib/framework/ESP8266React.cpp b/lib/framework/ESP8266React.cpp index 8ed68db24..d32f1f873 100644 --- a/lib/framework/ESP8266React.cpp +++ b/lib/framework/ESP8266React.cpp @@ -27,7 +27,7 @@ ESP8266React::ESP8266React(AsyncWebServer * server, FS * fs) static char last_modified[50]; sprintf(last_modified, "%s %s CET", __DATE__, __TIME__); - WWWData::registerRoutes([server](const String & uri, const String & contentType, const uint8_t * content, size_t len, const String & hash) { + WWWData::registerRoutes([server](const char * uri, const String & contentType, const uint8_t * content, size_t len, const String & hash) { ArRequestHandlerFunction requestHandler = [contentType, content, len, hash](AsyncWebServerRequest * request) { // Check if the client already has the same version and respond with a 304 (Not modified) if (request->header("If-Modified-Since").indexOf(last_modified) > 0) { @@ -36,7 +36,7 @@ ESP8266React::ESP8266React(AsyncWebServer * server, FS * fs) return request->send(304); } - AsyncWebServerResponse * response = request->beginResponse(contentType, content, len); + AsyncWebServerResponse * response = request->beginResponse_P(200, contentType, content, len); response->addHeader("Content-Encoding", "gzip"); // response->addHeader("Content-Encoding", "br"); // only works over HTTPS @@ -47,10 +47,10 @@ ESP8266React::ESP8266React(AsyncWebServer * server, FS * fs) request->send(response); }; - server->on(uri.c_str(), HTTP_GET, requestHandler); + server->on(uri, HTTP_GET, requestHandler); // Serving non matching get requests with "/index.html" // OPTIONS get a straight up 200 response - if (uri.equals("/index.html")) { + if (strncmp(uri, "/index.html", 11) == 0) { server->onNotFound([requestHandler](AsyncWebServerRequest * request) { if (request->method() == HTTP_GET) { requestHandler(request); @@ -87,4 +87,4 @@ void ESP8266React::loop() { _apSettingsService.loop(); _otaSettingsService.loop(); _mqttSettingsService.loop(); -} +} \ No newline at end of file