From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 25 Oct 2013 10:19:12 +0000 (+0200)
Subject: return 0 from serveConnection even after exceptions
X-Git-Tag: rec-3.6.0-rc1~375
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=244ad69a01d78cd46ac3e37a2391fffbbfa5156c;p=pdns

return 0 from serveConnection even after exceptions
---

diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index e759d1ef8..323ef6111 100644
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -206,18 +206,21 @@ try {
 }
 catch(SessionTimeoutException &e) {
   // L<<Logger::Error<<"Timeout in webserver"<<endl;
+  return 0;
 }
 catch(PDNSException &e) {
   L<<Logger::Error<<"Exception in webserver: "<<e.reason<<endl;
+  return 0;
 }
 catch(std::exception &e) {
   L<<Logger::Error<<"STL Exception in webserver: "<<e.what()<<endl;
+  return 0;
 }
 catch(...) {
   L<<Logger::Error<<"Unknown exception in webserver"<<endl;
+  return 0;
 }
 
-
 WebServer::WebServer(const string &listenaddress, int port, const string &password)
 {
   d_listenaddress=listenaddress;