From 9e96c6e3aa8ab6194884c7fcb372edb77677c8da Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 3 Dec 2008 13:52:00 +0000
Subject: [PATCH] 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
---
 daemon/daemon.c     | 10 ++++++++--
 doc/Changelog       |  6 ++++++
 util/iana_ports.inc |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 26eb3dceb..d0a3c8bb5 100644
--- 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 7a0e74aab..a6ac9f136 100644
--- 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 5ae21a81f..5c9741b00 100644
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -1842,6 +1842,7 @@
 2184,
 2185,
 2186,
+2187,
 2190,
 2191,
 2192,