Skip to content

Add LittleFS support to ESP8266WebServer.serveStatic() #6987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 5, 2020
Merged

Add LittleFS support to ESP8266WebServer.serveStatic() #6987

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c75e6bc
Remove trailing whitespace
JasperHorn Jan 4, 2020
cf18199
Improve "is file" check for LittleFS support
JasperHorn Jan 4, 2020
7537473
Merge branch 'master' into master
devyte Jan 5, 2020
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
12 changes: 10 additions & 2 deletions libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,15 @@ class StaticRequestHandler : public RequestHandler<ServerType> {
, _path(path)
, _cache_header(cache_header)
{
_isFile = fs.exists(path);
if (fs.exists(path)) {
File file = fs.open(path, "r");
_isFile = file && file.isFile();
file.close();
}
else {
_isFile = false;
}

DEBUGV("StaticRequestHandler: path=%s uri=%s isFile=%d, cache_header=%s\r\n", path, uri, _isFile, cache_header);
_baseUriLength = _uri.length();
}
Expand All @@ -96,7 +104,7 @@ class StaticRequestHandler : public RequestHandler<ServerType> {
if (!_isFile) {
// Base URI doesn't point to a file.
// If a directory is requested, look for index file.
if (requestUri.endsWith("/"))
if (requestUri.endsWith("/"))
requestUri += "index.htm";

// Append whatever follows this URI in request to get the file path.
Expand Down