diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 14:49:04 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 14:49:04 +0200 |
| commit | c250c50633d615ad261d8b3ff0e491f1032de5f6 (patch) | |
| tree | e684746f76c4ba8086a2b7efee81c18c9e1dad16 /ChangeLog | |
| parent | ae7a01e137f14055f9472408d0cf3ebf9893afba (diff) | |
| parent | 01adeab0cba21ad6193addf1a4e90689b507d092 (diff) | |
| download | rsyslog-c250c50633d615ad261d8b3ff0e491f1032de5f6.tar.gz rsyslog-c250c50633d615ad261d8b3ff0e491f1032de5f6.tar.xz rsyslog-c250c50633d615ad261d8b3ff0e491f1032de5f6.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -1,6 +1,7 @@ --------------------------------------------------------------------------- Version 3.21.11 [BETA] (rgerhards), 2009-0?-?? - build system improvements contributed by Michael Biebl - thx! +- all patches from 3.20.5 incorporated (see it's ChangeLog entry) --------------------------------------------------------------------------- Version 3.21.10 [BETA] (rgerhards), 2009-02-02 - bugfix: inconsistent use of mutex/atomic operations could cause segfault @@ -149,7 +150,16 @@ Version 3.21.0 [DEVEL] (rgerhards), 2008-07-18 - imported all changes from 3.18.1 until today (some quite important, see below) --------------------------------------------------------------------------- -Version 3.20.5 [v3-stable] (rgerhards), 2009-0?-?? +Version 3.20.5 [v3-stable] (rgerhards), 2009-04-02 +- bugfix: potential abort with DA queue after high watermark is reached + There exists a race condition that can lead to a segfault. Thanks + go to vbernetr, who performed the analysis and provided patch, which + I only tweaked a very little bit. +- fixed bugs in RainerScript: + o when converting a number and a string to a common type, both were + actually converted to the other variable's type. + o the value of rsCStrConvertToNumber() was miscalculated. + Thanks to varmojfekoj for the patch - fixed a bug in configure.ac which resulted in problems with environment detection - thanks to Michael Biebl for the patch - fixed a potential segfault problem in gssapi code |