noisymime
/
ESPAsyncWebServer
mirror of https://github.com/noisymime/ESPAsyncWebServer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

return 304 if file uses cache and size has not changed

This commit is contained in:
Me No Dev 2016-08-25 22:29:27 +03:00
parent 1163808495
commit 9ae9976b05
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/WebHandlers.cpp
View File

@ -89,8 +89,8 @@ bool AsyncStaticWebHandler::canHandle(AsyncWebServerRequest *request)
if (_last_modified.length()) if (_last_modified.length())
request->addInterestingHeader("If-Modified-Since"); request->addInterestingHeader("If-Modified-Since");
//if(_cache_control.length()) if(_cache_control.length())
// request->addInterestingHeader("If-None-Match"); request->addInterestingHeader("If-None-Match");
DEBUGF("[AsyncStaticWebHandler::canHandle] TRUE\n"); DEBUGF("[AsyncStaticWebHandler::canHandle] TRUE\n");
return true; return true;
@ -183,23 +183,23 @@ void AsyncStaticWebHandler::handleRequest(AsyncWebServerRequest *request)
request->_tempObject = NULL; request->_tempObject = NULL;
if (request->_tempFile == true) { if (request->_tempFile == true) {
//String etag = String(request->_tempFile.size()); String etag = String(request->_tempFile.size());
if (_last_modified.length() && _last_modified == request->header("If-Modified-Since")) { if (_last_modified.length() && _last_modified == request->header("If-Modified-Since")) {
request->_tempFile.close(); request->_tempFile.close();
request->send(304); // Not modified request->send(304); // Not modified
/*} else if (_cache_control.length() && request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag)) { } else if (_cache_control.length() && request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag)) {
request->_tempFile.close(); request->_tempFile.close();
AsyncWebServerResponse * response = new AsyncBasicResponse(304); // Not modified AsyncWebServerResponse * response = new AsyncBasicResponse(304); // Not modified
response->addHeader("Cache-Control", _cache_control); response->addHeader("Cache-Control", _cache_control);
response->addHeader("ETag", etag); response->addHeader("ETag", etag);
request->send(response);*/ request->send(response);
} else { } else {
AsyncWebServerResponse * response = new AsyncFileResponse(request->_tempFile, filename); AsyncWebServerResponse * response = new AsyncFileResponse(request->_tempFile, filename);
if (_last_modified.length()) if (_last_modified.length())
response->addHeader("Last-Modified", _last_modified); response->addHeader("Last-Modified", _last_modified);
if (_cache_control.length()){ if (_cache_control.length()){
response->addHeader("Cache-Control", _cache_control); response->addHeader("Cache-Control", _cache_control);
//response->addHeader("ETag", etag); response->addHeader("ETag", etag);
} }
request->send(response); request->send(response);
} }