Fix bug reported by Jaco with non-threaded unbound and statistics.

iana portlist updated.

git-svn-id: file:///svn/unbound/trunk@1380 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 26eb3dcebf19c2d851384515d7cca7818bea9623..d0a3c8bb5dc0bf316efc9ca2936be0ffbecf29a3 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -312,8 +312,14 @@ void close_other_pipes(struct daemon* daemon, int thr)
        int i;
        for(i=0; i<daemon->num; i++)
                if(i!=thr) {
-                       tube_delete(daemon->workers[i]->cmd);
-                       daemon->workers[i]->cmd = NULL;
+                       if(i==0) {
+                               /* only close read part, need to write stats */
+                               tube_close_read(daemon->workers[i]->cmd);
+                       } else {
+                               /* complete close channel to others */
+                               tube_delete(daemon->workers[i]->cmd);
+                               daemon->workers[i]->cmd = NULL;
+                       }
                }
 }
 

diff --git a/doc/Changelog b/doc/Changelog
index 7a0e74aabe6e07cea1b5a46df798ff396f9d483c..a6ac9f13605bd4b00263f23104d3cb717d025aeb 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,9 @@
+3 December 2008: Wouter
+       - Fix problem reported by Jaco Engelbrecht where unbound-control stats
+         freezes up unbound if this was compiled without threading, and
+         was using multiple processes.
+       - iana portlist updated.
+
 1 December 2008: Wouter
        - SElinux policy files in contrib/selinux for the unbound daemon,
          by Paul Wouters and Adam Tkac.

diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index 5ae21a81fd006ae02234fdb3cab85987bce53e84..5c9741b000ceba8b25ed95613ab459fda02068da 100644 (file)
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -1842,6 +1842,7 @@
 2184,
 2185,
 2186,
+2187,
 2190,
 2191,
 2192,