Merge branch 'master' into fix-serveStatic

Conflicts:
	src/AsyncWebServerHandlerImpl.h
This commit is contained in:
Andrew Melvin
2016-01-27 22:01:05 +02:00
13 changed files with 717 additions and 41 deletions

View File

@@ -21,7 +21,8 @@ class AsyncStaticWebHandler: public AsyncWebHandler {
public:
AsyncStaticWebHandler(FS& fs, const char* path, const char* uri, const char* cache_header)
: _fs(fs), _uri(uri), _path(path), _cache_header(cache_header){
_isFile = _fs.exists(path);
_isFile = _fs.exists(path) || _fs.exists((String(path)+".gz").c_str());
if (_uri != "/" && _uri.endsWith("/")) {
_uri = _uri.substring(0, _uri.length() - 1);
//os_printf("[AsyncStaticWebHandler] _uri / removed");