mirrors/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2025-05-10 01:33:53 +00:00
Code Issues Projects Releases Wiki 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
commit 916b2a8fd3
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
httplib.h
View File

@ -614,7 +614,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 &e)>; std::function<void(const Request &, Response &, std::exception_ptr ep)>;
enum class HandlerResponse { enum class HandlerResponse {
Handled, Handled,
@ -5721,16 +5721,23 @@ Server::process_request(Stream &strm, bool close_connection,
routed = routing(req, res, strm); routed = routing(req, res, strm);
} catch (std::exception &e) { } catch (std::exception &e) {
if (exception_handler_) { if (exception_handler_) {
exception_handler_(req, res, e); auto ep = std::current_exception();
exception_handler_(req, res, ep);
routed = true; routed = true;
} else { } else {
res.status = 500; res.status = 500;
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) {

7
test/test.cc
View File

@ -1249,8 +1249,13 @@ TEST(ExceptionHandlerTest, ContentLength) {
Server svr; Server svr;
svr.set_exception_handler([](const Request & /*req*/, Response &res, svr.set_exception_handler([](const Request & /*req*/, Response &res,
std::exception &e) { std::exception_ptr ep) {
EXPECT_FALSE(ep == nullptr);
try{
std::rethrow_exception(ep);
}catch(std::exception& e){
EXPECT_EQ("abc", std::string(e.what())); EXPECT_EQ("abc", std::string(e.what()));
}
res.status = 500; res.status = 500;
res.set_content("abcdefghijklmnopqrstuvwxyz", res.set_content("abcdefghijklmnopqrstuvwxyz",
"text/html"); // <= Content-Length still 13 at this point "text/html"); // <= Content-Length still 13 at this point