From defd907c7469c5c8281247b73bbd07be24c31164 Mon Sep 17 00:00:00 2001 From: yhirose Date: Fri, 27 Feb 2026 21:35:32 -0500 Subject: [PATCH] Merge commit from fork --- httplib.h | 11 ----------- test/test.cc | 6 ++---- 2 files changed, 2 insertions(+), 15 deletions(-) Index: cpp-httplib-0.22.0/httplib.h =================================================================== --- cpp-httplib-0.22.0.orig/httplib.h +++ cpp-httplib-0.22.0/httplib.h @@ -7636,16 +7636,6 @@ Server::process_request(Stream &strm, co routed = true; } else { res.status = StatusCode::InternalServerError_500; - std::string val; - auto s = e.what(); - for (size_t i = 0; s[i]; i++) { - switch (s[i]) { - case '\r': val += "\\r"; break; - case '\n': val += "\\n"; break; - default: val += s[i]; break; - } - } - res.set_header("EXCEPTION_WHAT", val); } } catch (...) { if (exception_handler_) { @@ -7654,7 +7644,6 @@ Server::process_request(Stream &strm, co routed = true; } else { res.status = StatusCode::InternalServerError_500; - res.set_header("EXCEPTION_WHAT", "UNKNOWN"); } } #endif Index: cpp-httplib-0.22.0/test/test.cc =================================================================== --- cpp-httplib-0.22.0.orig/test/test.cc +++ cpp-httplib-0.22.0/test/test.cc @@ -2113,16 +2113,14 @@ TEST(ExceptionTest, WithoutExceptionHand auto res = cli.Get("/exception"); ASSERT_TRUE(res); EXPECT_EQ(StatusCode::InternalServerError_500, res->status); - ASSERT_TRUE(res->has_header("EXCEPTION_WHAT")); - EXPECT_EQ("exception...", res->get_header_value("EXCEPTION_WHAT")); + EXPECT_FALSE(res->has_header("EXCEPTION_WHAT")); } { auto res = cli.Get("/unknown"); ASSERT_TRUE(res); EXPECT_EQ(StatusCode::InternalServerError_500, res->status); - ASSERT_TRUE(res->has_header("EXCEPTION_WHAT")); - EXPECT_EQ("exception\\r\\n...", res->get_header_value("EXCEPTION_WHAT")); + EXPECT_FALSE(res->has_header("EXCEPTION_WHAT")); } }