lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-20 11:47:43 +03:00
Code

Code format

Browse Source
This commit is contained in:
yhirose 2020-02-02 20:02:16 -05:00
parent 1a2a6e2b01
commit 851edaf77f
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
httplib.h
View File

@ -465,8 +465,9 @@ public:
Server &Delete(const char *pattern, Handler handler); Server &Delete(const char *pattern, Handler handler);
Server &Options(const char *pattern, Handler handler); Server &Options(const char *pattern, Handler handler);
[[deprecated]] bool set_base_dir(const char *dir, const char *mount_point = nullptr); [[deprecated]] bool set_base_dir(const char *dir,
bool set_mount_point(const char *mount_point, const char* dir); const char *mount_point = nullptr);
bool set_mount_point(const char *mount_point, const char *dir);
bool remove_mount_point(const char *mount_point); bool remove_mount_point(const char *mount_point);
void set_file_extension_and_mimetype_mapping(const char *ext, void set_file_extension_and_mimetype_mapping(const char *ext,
const char *mime); const char *mime);
@ -2891,10 +2892,10 @@ inline Server &Server::Options(const char *pattern, Handler handler) {
} }
inline bool Server::set_base_dir(const char *dir, const char *mount_point) { inline bool Server::set_base_dir(const char *dir, const char *mount_point) {
return set_mount_point(mount_point, dir); return set_mount_point(mount_point, dir);
} }
inline bool Server::set_mount_point(const char *mount_point, const char* dir) { inline bool Server::set_mount_point(const char *mount_point, const char *dir) {
if (detail::is_dir(dir)) { if (detail::is_dir(dir)) {
std::string mnt = mount_point ? mount_point : "/"; std::string mnt = mount_point ? mount_point : "/";
if (!mnt.empty() && mnt[0] == '/') { if (!mnt.empty() && mnt[0] == '/') {
@ -2907,10 +2908,10 @@ inline bool Server::set_mount_point(const char *mount_point, const char* dir) {
inline bool Server::remove_mount_point(const char *mount_point) { inline bool Server::remove_mount_point(const char *mount_point) {
for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) { for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) {
if (it->first == mount_point) { if (it->first == mount_point) {
base_dirs_.erase(it); base_dirs_.erase(it);
return true; return true;
} }
} }
return false; return false;
} }
@ -3228,7 +3229,8 @@ inline bool Server::read_content_core(Stream &strm, bool last_connection,
return true; return true;
} }
inline bool Server::handle_file_request(Request &req, Response &res, bool head) { inline bool Server::handle_file_request(Request &req, Response &res,
bool head) {
for (const auto &kv : base_dirs_) { for (const auto &kv : base_dirs_) {
const auto &mount_point = kv.first; const auto &mount_point = kv.first;
const auto &base_dir = kv.second; const auto &base_dir = kv.second;
@ -3246,7 +3248,9 @@ inline bool Server::handle_file_request(Request &req, Response &res, bool head)
detail::find_content_type(path, file_extension_and_mimetype_map_); detail::find_content_type(path, file_extension_and_mimetype_map_);
if (type) { res.set_header("Content-Type", type); } if (type) { res.set_header("Content-Type", type); }
res.status = 200; res.status = 200;
if (!head && file_request_handler_) { file_request_handler_(req, res); } if (!head && file_request_handler_) {
file_request_handler_(req, res);
}
return true; return true;
} }
} }
@ -3348,7 +3352,10 @@ inline bool Server::routing(Request &req, Response &res, Stream &strm,
bool last_connection) { bool last_connection) {
// File handler // File handler
bool is_head_request = req.method == "HEAD"; bool is_head_request = req.method == "HEAD";
if ((req.method == "GET" || is_head_request) && handle_file_request(req, res, is_head_request)) { return true; } if ((req.method == "GET" || is_head_request) &&
handle_file_request(req, res, is_head_request)) {
return true;
}
if (detail::expect_content(req)) { if (detail::expect_content(req)) {
// Content reader handler // Content reader handler

2
test/test.cc
View File

@ -201,7 +201,7 @@ TEST(ParseHeaderValueTest, Range) {
TEST(BufferStreamTest, read) { TEST(BufferStreamTest, read) {
detail::BufferStream strm1; detail::BufferStream strm1;
Stream& strm = strm1; Stream &strm = strm1;
EXPECT_EQ(5, strm.write("hello")); EXPECT_EQ(5, strm.write("hello"));