lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-05-08 17:41:29 +03:00
Code

fix double ref and case of exceptions that are not std::exception

Browse Source
This commit is contained in:
Kai Aoki 2022-07-15 01:45:10 +09:00
parent 72d3f4896a
commit d4ab2fa0e6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
httplib.h
View File

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