feedc0de/ESPAsyncWebServer
1
0
Fork 0
forked from me-no-dev/ESPAsyncWebServer
Code Pull Requests Activity

fix broken send of gzipped files

Browse Source
This commit is contained in:
Me No Dev
2016-06-18 01:28:36 +03:00
parent 89b19e8cde
commit e46d4d7418
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/WebResponses.cpp
View File

@@ -357,19 +357,20 @@ void AsyncFileResponse::_setContentType(String path){
AsyncFileResponse::AsyncFileResponse(FS &fs, String path, String contentType, bool download){ AsyncFileResponse::AsyncFileResponse(FS &fs, String path, String contentType, bool download){
_code = 200; _code = 200;
_path = path; _path = path;
_content = fs.open(_path, "r");
_contentLength = _content.size();
if(!download && !fs.exists(_path) && fs.exists(_path+".gz")){ if(!download && !fs.exists(_path) && fs.exists(_path+".gz")){
_path = _path+".gz"; _path = _path+".gz";
addHeader("Content-Encoding", "gzip"); addHeader("Content-Encoding", "gzip");
} }
_content = fs.open(_path, "r");
_contentLength = _content.size();
if(contentType == "") if(contentType == "")
_setContentType(path); _setContentType(path);
else else
_contentType = contentType; _contentType = contentType;
int filenameStart = path.lastIndexOf('/') + 1; int filenameStart = path.lastIndexOf('/') + 1;
char buf[26+path.length()-filenameStart]; char buf[26+path.length()-filenameStart];
char* filename = (char*)path.c_str() + filenameStart; char* filename = (char*)path.c_str() + filenameStart;
@@ -390,15 +391,15 @@ AsyncFileResponse::AsyncFileResponse(File content, String path, String contentTy
_path = path; _path = path;
_content = content; _content = content;
_contentLength = _content.size(); _contentLength = _content.size();
if(!download && String(_content.name()).endsWith(".gz")) if(!download && String(_content.name()).endsWith(".gz"))
addHeader("Content-Encoding", "gzip"); addHeader("Content-Encoding", "gzip");
if(contentType == "") if(contentType == "")
_setContentType(path); _setContentType(path);
else else
_contentType = contentType; _contentType = contentType;
int filenameStart = path.lastIndexOf('/') + 1; int filenameStart = path.lastIndexOf('/') + 1;
char buf[26+path.length()-filenameStart]; char buf[26+path.length()-filenameStart];
char* filename = (char*)path.c_str() + filenameStart; char* filename = (char*)path.c_str() + filenameStart;