Mirror/Crow
1
0
Fork 0
mirror of https://github.com/CrowCpp/Crow.git synced 2024-06-07 21:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into gcc48

Browse Source
This commit is contained in:
Farook Al-Sammarraie 2022-04-25 09:34:52 +03:00 committed by GitHub
commit b6a04058a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/crow/http_response.h
View File

@ -242,17 +242,20 @@ namespace crow
{
std::size_t last_dot = path.find_last_of(".");
std::string extension = path.substr(last_dot + 1);
std::string mimeType = "";
code = 200;
this->add_header("Content-length", std::to_string(file_info.statbuf.st_size));
this->add_header("Content-Length", std::to_string(file_info.statbuf.st_size));
if (extension != "")
if (!extension.empty())
{
mimeType = mime_types.at(extension);
if (mimeType != "")
this->add_header("Content-Type", mimeType);
const auto mimeType = mime_types.find(extension);
if (mimeType != mime_types.end())
{
this->add_header("Content-Type", mimeType->second);
}
else
this->add_header("content-Type", "text/plain");
{
this->add_header("Content-Type", "text/plain");
}
}
}
else

1
tests/img/filewith.badext Normal file
View File

@ -0,0 +1 @@
Test file with a strange extension.

28
tests/unittest.cpp
View File

@ -1926,8 +1926,10 @@ TEST_CASE("multipart")
TEST_CASE("send_file")
{
struct stat statbuf;
stat("tests/img/cat.jpg", &statbuf);
struct stat statbuf_cat;
stat("tests/img/cat.jpg", &statbuf_cat);
struct stat statbuf_badext;
stat("tests/img/filewith.badext", &statbuf_badext);
SimpleApp app;
@ -1944,6 +1946,12 @@ TEST_CASE("send_file")
res.end();
});
CROW_ROUTE(app, "/filewith.badext")
([](const crow::request&, crow::response& res) {
res.set_static_file_info("tests/img/filewith.badext");
res.end();
});
app.validate();
//File not found check
@ -1971,7 +1979,21 @@ TEST_CASE("send_file")
CHECK(200 == res.code);
CHECK("image/jpeg" == res.headers.find("Content-Type")->second);
CHECK(to_string(statbuf.st_size) == res.headers.find("Content-Length")->second);
CHECK(to_string(statbuf_cat.st_size) == res.headers.find("Content-Length")->second);
}
//Unknown extension check
{
request req;
response res;
req.url = "/filewith.badext";
req.http_ver_major = 1;
CHECK_NOTHROW(app.handle(req, res));
CHECK(200 == res.code);
CHECK("text/plain" == res.headers.find("Content-Type")->second);
CHECK(to_string(statbuf_badext.st_size) == res.headers.find("Content-Length")->second);
}
} // send_file