From 8e45dd88c76f3e64e6afe887e58d962fe595d67b Mon Sep 17 00:00:00 2001 From: Bert Hubert Date: Thu, 30 Jul 2009 20:44:23 +0000 Subject: [PATCH] cherrypick 1372, solaris ports mplexer issue git-svn-id: svn://svn.powerdns.com/pdns/tags/pdns-3.1.7.1@1387 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- pdns/portsmplexer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pdns/portsmplexer.cc b/pdns/portsmplexer.cc index 9759e8b21..ba4db6bad 100644 --- a/pdns/portsmplexer.cc +++ b/pdns/portsmplexer.cc @@ -74,7 +74,7 @@ void PortsFDMultiplexer::removeFD(callbackmap_t& cbmap, int fd) if(!cbmap.erase(fd)) throw FDMultiplexerException("Tried to remove unlisted fd "+lexical_cast(fd)+ " from multiplexer"); - if(port_dissociate(d_portfd, PORT_SOURCE_FD, fd) < 0) + if(port_dissociate(d_portfd, PORT_SOURCE_FD, fd) < 0 && errno != ENOENT) // it appears under some circumstances, ENOENT will be returned, without this being an error. Apache has this same "fix" throw FDMultiplexerException("Removing fd from port set: "+stringerror()); } -- 2.40.0