From 89a5aecc63f77969bb06a0b5e5f965976a5bf93f Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 13 Sep 2019 15:07:08 +0200
Subject: [PATCH] webserver: handle exceptions instead of SIGABRTing the world

---
 pdns/webserver.cc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 1b14c1487..eafd3059a 100644
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -202,7 +202,18 @@ void WebServer::registerWebHandler(const string& url, HandlerFunction handler) {
 
 static void *WebServerConnectionThreadStart(const WebServer* webServer, std::shared_ptr<Socket> client) {
   setThreadName("pdns-r/webhndlr");
-  webServer->serveConnection(client);
+  try {
+    webServer->serveConnection(client);
+  }
+  catch(PDNSException &e) {
+    g_log<<Logger::Error<<"PDNSException while serving a connection in main webserver thread: "<<e.reason<<endl;
+  }
+  catch(std::exception &e) {
+    g_log<<Logger::Error<<"STL Exception while serving a connection in main webserver thread: "<<e.what()<<endl;
+  }
+  catch(...) {
+    g_log<<Logger::Error<<"Unknown exception while serving a connection in main webserver thread"<<endl;
+  }
   return nullptr;
 }
 
-- 
2.40.0