@@ -1087,8 +1087,7 @@ class Server {
1087
1087
bool listen_internal ();
1088
1088
1089
1089
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);
1092
1091
bool dispatch_request (Request &req, Response &res,
1093
1092
const Handlers &handlers) const ;
1094
1093
bool dispatch_request_for_content_reader (
@@ -6880,8 +6879,7 @@ Server::read_content_core(Stream &strm, Request &req, Response &res,
6880
6879
return true ;
6881
6880
}
6882
6881
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) {
6885
6883
for (const auto &entry : base_dirs_) {
6886
6884
// Prefix match
6887
6885
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,
6914
6912
return true ;
6915
6913
});
6916
6914
6917
- if (!head && file_request_handler_) {
6915
+ if (req. method != " HEAD " && file_request_handler_) {
6918
6916
file_request_handler_ (req, res);
6919
6917
}
6920
6918
@@ -7048,9 +7046,8 @@ inline bool Server::routing(Request &req, Response &res, Stream &strm) {
7048
7046
}
7049
7047
7050
7048
// 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)) {
7054
7051
return true ;
7055
7052
}
7056
7053
0 commit comments