If accept() returns EAGAIN, Socket::accept() returns a null pointer

diff --git a/pdns/sstuff.hh b/pdns/sstuff.hh
index e7fb6ee9ab2fddf8bf1c299b5c0075af22fc1a6d..707b1ad12b2b23da3ebe03a482e4dab49ff8de1c 100644 (file)
--- a/pdns/sstuff.hh
+++ b/pdns/sstuff.hh
@@ -96,7 +96,7 @@ public:
     int s=::accept(d_socket,(sockaddr *)&remote, &remlen);
     if(s<0) {
       if(errno==EAGAIN)
-        return 0;
+        return nullptr;
 
       throw NetworkError("Accepting a connection: "+string(strerror(errno)));
     }

diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 09e838ac0ee98eb191698d2c116d7ad1c2bdfd33..7cfba4153b6b711151e9c927a8a0bc6c300aa8b2 100644 (file)
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -350,6 +350,9 @@ void WebServer::go()
     while(true) {
       try {
         auto client = d_server->accept();
+        if (!client) {
+          continue;
+        }
         if (client->acl(acl)) {
           std::thread webHandler(WebServerConnectionThreadStart, this, client);
           webHandler.detach();

diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index f590bd12b70eb51284972505d270d05e715aee4d..e54d81258628fe5c1cfdcfce679ff1589eccf7cd 100644 (file)
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -541,7 +541,9 @@ void AsyncServerNewConnectionMT(void *p) {
   AsyncServer *server = (AsyncServer*)p;
   try {
     auto socket = server->accept();
-    server->d_asyncNewConnectionCallback(socket);
+    if (socket) {
+      server->d_asyncNewConnectionCallback(socket);
+    }
   } catch (NetworkError &e) {
     // we're running in a shared process/thread, so can't just terminate/abort.
     return;