Merge branch 'v4-stable' into v4-beta

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imrelp/imrelp.c

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6583395a..7c2c9c28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,7 +150,11 @@ Version 4.5.0  [DEVEL] (rgerhards), 2009-07-02
   This could lead to timestamps written in the wrong format, but not to
   an abort
 ---------------------------------------------------------------------------
-Version 4.4.2  [v4-stable] (rgerhards), 2009-09-??
+Version 4.4.3  [v4-stable] (rgerhards), 2009-10-??
+- bugfix: potential hang condition on queue shutdown
+  [imported from v3-stable]
+---------------------------------------------------------------------------
+Version 4.4.2  [v4-stable] (rgerhards), 2009-10-09
 - bugfix: invalid handling of zero-sized messages, could lead to mis-
   addressing and potential memory corruption/segfault
 - bugfix: zero-sized UDP messages are no longer processed
@@ -404,6 +408,7 @@ Version 3.22.2 [v3-stable] (rgerhards), 2009-07-??
 - enhance: imrelp now also provides remote peer's IP address 
   [if librelp != 1.0.0 is used]
 - bugfix: sending syslog messages with zip compression did not work
+- bugfix: potential hang condition on queue shutdown
 - clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers]
   in doc set (require TLS drivers)
 ---------------------------------------------------------------------------
diff --git a/runtime/wtp.c b/runtime/wtp.c
index 596ff866..0c66dd11 100644
--- a/runtime/wtp.c
+++ b/runtime/wtp.c
@@ -181,9 +181,7 @@ wtpWakeupAllWrkr(wtp_t *pThis)
 	DEFiRet;
 
 	ISOBJ_TYPE_assert(pThis, wtp);
-	d_pthread_mutex_lock(pThis->pmutUsr);
 	pthread_cond_broadcast(pThis->pcondBusy);
-	d_pthread_mutex_unlock(pThis->pmutUsr);
 	RETiRet;
 }