lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-06-12 07:41:53 +03:00
Code Activity

Merge branch 'use_exception_ptr' of https://github.com/kuguma/cpp-httplib into kuguma-use_exception_ptr

Browse Source
This commit is contained in:
yhirose
2022-07-15 17:19:39 -04:00
parent 3e21338f82 869f5bb279
commit 916b2a8fd3
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
httplib.h
View File

@ -614,7 +614,7 @@ public:
using Handler = std::function<void(const Request &, Response &)>;
using ExceptionHandler =
std::function<void(const Request &, Response &, std::exception &e)>;
std::function<void(const Request &, Response &, std::exception_ptr ep)>;
enum class HandlerResponse {
Handled,
@ -5721,15 +5721,22 @@ Server::process_request(Stream &strm, bool close_connection,
routed = routing(req, res, strm);
} catch (std::exception &e) {
if (exception_handler_) {
exception_handler_(req, res, e);
auto ep = std::current_exception();
exception_handler_(req, res, ep);
routed = true;
} else {
res.status = 500;
res.set_header("EXCEPTION_WHAT", e.what());
}
} catch (...) {
res.status = 500;
res.set_header("EXCEPTION_WHAT", "UNKNOWN");
if (exception_handler_) {
auto ep = std::current_exception();
exception_handler_(req, res, ep);
routed = true;
} else {
res.status = 500;
res.set_header("EXCEPTION_WHAT", "UNKNOWN");
}
}
#endif