diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-20 11:07:52 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-20 11:07:52 +0200 |
| commit | b840e300dfd2bea4194786974c5e9fbec26e4b96 (patch) | |
| tree | 76cbd4682f48dfa97e45c3cf40ddd1668d4c9610 | |
| parent | 7f9db36d9a56a3d2cae2d6cfd97240fad2f85a51 (diff) | |
| parent | 8e45fd5c8e7df45532c5d239676cd92107c9e942 (diff) | |
| download | rsyslog-b840e300dfd2bea4194786974c5e9fbec26e4b96.tar.gz rsyslog-b840e300dfd2bea4194786974c5e9fbec26e4b96.tar.xz rsyslog-b840e300dfd2bea4194786974c5e9fbec26e4b96.zip | |
Merge branch 'v3-stable' into v4-stable
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | runtime/wtp.c | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -253,6 +253,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 04eb974f..747ddb4a 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -179,9 +179,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; } |