From 7b6fa1eb9516ca15e7b898cf38cc88ae68e74e5e Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 22 Apr 2021 14:49:22 +0200
Subject: [PATCH] dnsdist: Properly handle errors for DoH cross-protocol
 answers

---
 pdns/dnsdistdist/doh.cc | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pdns/dnsdistdist/doh.cc b/pdns/dnsdistdist/doh.cc
index e3807871ce..c0d8688dec 100644
--- a/pdns/dnsdistdist/doh.cc
+++ b/pdns/dnsdistdist/doh.cc
@@ -1103,7 +1103,6 @@ static void dnsdistclient(int qsock)
         }
       }
       else {
-        cerr<<"leaving existing EDNS in place"<<endl;
         // we leave existing EDNS in place
       }
 
@@ -1191,12 +1190,22 @@ public:
 
   void handleXFRResponse(const struct timeval& now, TCPResponse&& response) override
   {
-    throw std::runtime_error("Oops");
+    return handleResponse(now, std::move(response));
   }
 
   void notifyIOError(IDState&& query, const struct timeval& now) override
   {
-    throw std::runtime_error("Oops");
+    if (!du) {
+      return;
+    }
+
+    if (du->rsock == -1) {
+      return;
+    }
+
+    du->status_code = 502;
+    sendDoHUnitToTheMainThread(du, "cross-protocol error response");
+    du->release();
   }
 
 private:
-- 
2.47.2