From 5d7bd1008adcd320679732c39b3d4943c76f5b60 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <christian.hofstaedtler@deduktiva.com>
Date: Mon, 26 Jun 2017 15:55:47 +0200
Subject: [PATCH] auth/rec ws: sync caught serveConnection exceptions

---
 pdns/ws-recursor.cc | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index e45d65e6bb..32b4657b50 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -560,9 +560,9 @@ void AsyncServer::newConnection()
   getMT()->makeThread(&AsyncServerNewConnectionMT, this);
 }
 
-
+// This is an entry point from FDM, so it needs to catch everything.
 void AsyncWebServer::serveConnection(Socket *client)
-{
+try {
   HttpRequest req;
   YaHTTP::AsyncRequestLoader yarl;
   yarl.initialize(&req);
@@ -595,6 +595,16 @@ void AsyncWebServer::serveConnection(Socket *client)
     L<<Logger::Error<<"Failed sending reply to HTTP client"<<endl;
   }
 }
+catch(PDNSException &e) {
+  L<<Logger::Error<<"HTTP Exception: "<<e.reason<<endl;
+}
+catch(std::exception &e) {
+  if(strstr(e.what(), "timeout")==0)
+    L<<Logger::Error<<"HTTP STL Exception: "<<e.what()<<endl;
+}
+catch(...) {
+  L<<Logger::Error<<"HTTP: Unknown exception"<<endl;
+}
 
 void AsyncWebServer::go() {
   if (!d_server)
-- 
2.47.2