diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-21 12:13:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-21 12:13:06 +0200 |
| commit | 38e83becf605f128ebae26fd58c68c2ef38e946a (patch) | |
| tree | 18f9ab59b06d04587880fd1b4c850d91ee3d2cad | |
| parent | ad40d586ab374ec48379a43342786feb4da778b1 (diff) | |
| parent | 04ca2611194affee966344db20cdaa7c663f99d9 (diff) | |
| download | rsyslog-38e83becf605f128ebae26fd58c68c2ef38e946a.tar.gz rsyslog-38e83becf605f128ebae26fd58c68c2ef38e946a.tar.xz rsyslog-38e83becf605f128ebae26fd58c68c2ef38e946a.zip | |
Merge branch 'v4-beta' into v4-devel
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | runtime/wtp.c | 2 |
2 files changed, 7 insertions, 4 deletions
@@ -25,7 +25,7 @@ Version 4.5.6 [v4-beta] (rgerhards), 2009-09-?? * bugfix: random data could be appended to message * bugfix: reverse lookup reduction logic in imudp do DNS queries too often --------------------------------------------------------------------------- -Version 4.5.5 [v4-beta] (rgerhards), 2009-09-?? +Version 4.5.5 [v4-beta] (rgerhards), 2009-10-21 - added $InputTCPServerNotifyOnConnectionClose config directive see doc for details - bugfix: debug string larger than 1K were improperly displayed. Max size @@ -165,7 +165,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 @@ -419,6 +423,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; } |