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

fix for file download/rendering response (#40) 

tested with chromium and firefox and all content types i had handy.

chrome and firefox render all files inline, if they can. chrome downloads files when asked to download, firefox opens a download dialog.
This commit is contained in:
Clemens Kirchgatterer 2016-06-15 17:21:16 +02:00 committed by Me No Dev
parent ba45a834e9
commit f384cd1f76
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/WebResponses.cpp
View File

@ -333,7 +333,6 @@ void AsyncFileResponse::_setContentType(String path){
if (path.endsWith(".html")) _contentType = "text/html";
else if (path.endsWith(".htm")) _contentType = "text/html";
else if (path.endsWith(".css")) _contentType = "text/css";
else if (path.endsWith(".txt")) _contentType = "text/plain";
else if (path.endsWith(".js")) _contentType = "application/javascript";
else if (path.endsWith(".png")) _contentType = "image/png";
else if (path.endsWith(".gif")) _contentType = "image/gif";
@ -344,21 +343,33 @@ void AsyncFileResponse::_setContentType(String path){
else if (path.endsWith(".pdf")) _contentType = "application/pdf";
else if (path.endsWith(".zip")) _contentType = "application/zip";
else if(path.endsWith(".gz")) _contentType = "application/x-gzip";
else _contentType = "application/octet-stream";
else _contentType = "text/plain";
}
AsyncFileResponse::AsyncFileResponse(FS &fs, String path, String contentType, bool download){
char buf[64];
_code = 200;
_path = path;
if(!download && !fs.exists(_path) && fs.exists(_path+".gz")){
_path = _path+".gz";
addHeader("Content-Encoding", "gzip");
}
if(download)
_contentType = "application/octet-stream";
else
if(contentType == "")
_setContentType(path);
else
_contentType = contentType;
if(download) {
// set filename and force download
snprintf(buf, sizeof (buf), "attachment; filename='%s'", path.c_str());
} else {
// set filename and force rendering
snprintf(buf, sizeof (buf), "inline; filename='%s'", path.c_str());
}
addHeader("Content-Disposition", buf);
_content = fs.open(_path, "r");
_contentLength = _content.size();
}