Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve #2017 #2022

Merged
merged 3 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,21 @@ int main(void)
res.set_content(req.body, "text/plain");
});

// If the handler takes time to finish, you can also poll the connection state
svr.Get("/task", [&](const Request& req, Response& res) {
const char * result = nullptr;
process.run(); // for example, starting an external process
while (result == nullptr) {
sleep(1);
if (req.is_connection_closed()) {
process.kill(); // kill the process
return;
}
result = process.stdout(); // != nullptr if the process finishes
}
res.set_content(result, "text/plain");
});

svr.Get("/stop", [&](const Request& req, Response& res) {
svr.stop();
});
Expand Down
8 changes: 7 additions & 1 deletion httplib.h
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@ struct Request {
Ranges ranges;
Match matches;
std::unordered_map<std::string, std::string> path_params;
std::function<bool()> is_connection_closed = []() { return true; };

// for client
ResponseHandler response_handler;
Expand Down Expand Up @@ -2572,7 +2573,7 @@ inline bool is_field_content(const std::string &s) {

inline bool is_field_value(const std::string &s) { return is_field_content(s); }

}; // namespace fields
} // namespace fields

} // namespace detail

Expand Down Expand Up @@ -7217,6 +7218,11 @@ Server::process_request(Stream &strm, const std::string &remote_addr,
}
}

// Setup `is_connection_closed` method
req.is_connection_closed = [&]() {
return !detail::is_socket_alive(strm.socket());
};

// Routing
auto routed = false;
#ifdef CPPHTTPLIB_NO_EXCEPTIONS
Expand Down
Loading