diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 12:43:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 12:43:19 +0200 |
| commit | be0a6eb45830f486ea2ac755ee11f7503454aa08 (patch) | |
| tree | 41cd388f3bdf33bfbddbda20bd72e54ef95657a4 | |
| parent | 95fefbc12a71c26e02bb1de8628b3f70a6856b08 (diff) | |
| parent | 6bfc397b09eab1269a718f1bf661bb31cadd626b (diff) | |
| download | rsyslog-be0a6eb45830f486ea2ac755ee11f7503454aa08.tar.gz rsyslog-be0a6eb45830f486ea2ac755ee11f7503454aa08.tar.bz2 rsyslog-be0a6eb45830f486ea2ac755ee11f7503454aa08.zip | |
Merge branch 'v6-stable' into v7-stable
Conflicts:
configure.ac
doc/manual.html
template.c
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | runtime/debug.c | 6 |
2 files changed, 11 insertions, 5 deletions
@@ -138,7 +138,11 @@ Version 7.1.0 [devel] 2012-09-06 - bugfix: imtcp could abort on exit due to invalid free() - imported bugfixes from 6.4.1 --------------------------------------------------------------------------- -Version 6.5.1 [devel] 2012-08-?? +Version 6.6.0 [v6-stable] 2012-10-22 +This starts a new stable branch, based on the 6.5.x series, plus: +- bugfix: imuxsock did not properly honor $LocalHostIPIF +--------------------------------------------------------------------------- +Version 6.5.1 [beta] 2012-10-11 - added tool "logctl" to handle lumberjack logs in MongoDB - imfile ported to new v6 config interface - imfile now supports config parameter for maximum number of submits @@ -188,7 +192,9 @@ Version 6.5.0 [devel] 2012-08-28 Note: patches were released under ASL 2.0, see http://bugzilla.adiscon.com/show_bug.cgi?id=353 --------------------------------------------------------------------------- -Version 6.4.3 [V6-STABLE] 2012-??-?? +Version 6.4.3 [V6-STABLE/NEVER RELEASED] 2012-??-?? +This version was never released as 6.6.0 came quickly enough. Note that +all these patches here are present in 6.6.0. - cleanup: removed remains of -c option (compatibility mode) both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 diff --git a/runtime/debug.c b/runtime/debug.c index edc4a255..307a8bb8 100644 --- a/runtime/debug.c +++ b/runtime/debug.c @@ -927,12 +927,12 @@ dbgprint(obj_t *pObj, char *pszMsg, size_t lenMsg) pszObjName = obj.GetName(pObj); } -// pthread_mutex_lock(&mutdbgprint); -// pthread_cleanup_push(dbgMutexCancelCleanupHdlr, &mutdbgprint); + pthread_mutex_lock(&mutdbgprint); + pthread_cleanup_push(dbgMutexCancelCleanupHdlr, &mutdbgprint); do_dbgprint(pszObjName, pszMsg, lenMsg); -// pthread_cleanup_pop(1); + pthread_cleanup_pop(1); } #pragma GCC diagnostic warning "-Wempty-body" |