Skip to content

Commit c216dc9

Browse files
committed
Code cleanup
1 parent 61893a0 commit c216dc9

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

httplib.h

+5-8
Original file line numberDiff line numberDiff line change
@@ -1087,8 +1087,7 @@ class Server {
10871087
bool listen_internal();
10881088

10891089
bool routing(Request &req, Response &res, Stream &strm);
1090-
bool handle_file_request(const Request &req, Response &res,
1091-
bool head = false);
1090+
bool handle_file_request(const Request &req, Response &res);
10921091
bool dispatch_request(Request &req, Response &res,
10931092
const Handlers &handlers) const;
10941093
bool dispatch_request_for_content_reader(
@@ -6880,8 +6879,7 @@ Server::read_content_core(Stream &strm, Request &req, Response &res,
68806879
return true;
68816880
}
68826881

6883-
inline bool Server::handle_file_request(const Request &req, Response &res,
6884-
bool head) {
6882+
inline bool Server::handle_file_request(const Request &req, Response &res) {
68856883
for (const auto &entry : base_dirs_) {
68866884
// Prefix match
68876885
if (!req.path.compare(0, entry.mount_point.size(), entry.mount_point)) {
@@ -6914,7 +6912,7 @@ inline bool Server::handle_file_request(const Request &req, Response &res,
69146912
return true;
69156913
});
69166914

6917-
if (!head && file_request_handler_) {
6915+
if (req.method != "HEAD" && file_request_handler_) {
69186916
file_request_handler_(req, res);
69196917
}
69206918

@@ -7048,9 +7046,8 @@ inline bool Server::routing(Request &req, Response &res, Stream &strm) {
70487046
}
70497047

70507048
// File handler
7051-
auto is_head_request = req.method == "HEAD";
7052-
if ((req.method == "GET" || is_head_request) &&
7053-
handle_file_request(req, res, is_head_request)) {
7049+
if ((req.method == "GET" || req.method == "HEAD") &&
7050+
handle_file_request(req, res)) {
70547051
return true;
70557052
}
70567053

0 commit comments

Comments
 (0)