Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 1 | -1/+9 |
|\ | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 1 | -0/+3 |
| | | |||||
| * | bugfixes for tag emulation | Rainer Gerhards | 2011-08-11 | 1 | -1/+3 |
| | | | | | | | | | | - bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation | ||||
* | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-11 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | fixed typo in changelog | Andre Lorbach | 2011-08-10 | 1 | -1/+1 |
| | | |||||
| * | added changelog entry | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
| | | |||||
| * | preparing for version 5.8.4v5.8.4 | root | 2011-08-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
|\| | |||||
| * | Added changelog entry for bugid 275 | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
| | | |||||
* | | minor: added imported bug to ChangeLog | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-08-09 | 1 | -0/+6 |
|\| | |||||
| * | cosmetic: add imported bugfix to ChangeLog | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| | | |||||
| * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| |\ | |||||
| | * | bugfix: memcpy overflow can occur in allowed sender checking | Marius Tomaschewski | 2011-08-09 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | ...if a host name is resolved to IPv4-mapped-on-IPv6 address. Found by Ismail Dönmez at suse. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-05 | 1 | -0/+10 |
|\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | Merge branch 'v4-stable' into v5-stable | Andre Lorbach | 2011-08-05 | 1 | -0/+4 |
| |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | Merge branch 'v3-stable' into v4-stable | Andre Lorbach | 2011-08-05 | 1 | -0/+4 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| | | * | bugfix: potential misadressing in property replacer | Andre Lorbach | 2011-08-05 | 1 | -0/+1 |
| | | | | |||||
| * | | | Added changelog entry | Andre Lorbach | 2011-08-05 | 1 | -0/+3 |
| | | | | |||||
* | | | | preparing for 6.1.11v6.1.11 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-11 | 1 | -3/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | preparing for 5.8.3v5.8.3 | Rainer Gerhards | 2011-07-11 | 1 | -1/+4 |
| | | | | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -1/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh | ||||
| | * | | preparing for 4.6.7 releasev4.6.7 | Rainer Gerhards | 2011-07-11 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-06 | 1 | -1/+12 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 1 | -1/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | added support for the ":omusrmsg:" syntax in configuring user messages | Rainer Gerhards | 2011-07-06 | 1 | -0/+3 |
| | | | | |||||
| | * | | preparing for 4.6.6v4.6.6 | Rainer Gerhards | 2011-06-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | doc: mentioned Lennart's patch in ChangeLog | Rainer Gerhards | 2011-07-02 | 1 | -0/+3 |
| | | | | |||||
* | | | | prepare for 6.1.10v6.1.10 | Rainer Gerhards | 2011-06-22 | 1 | -0/+12 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 1 | -1/+31 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | ||||
| * | | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least one case where this can occur is during thread shutdown, which may be initiated by lower activity. In most cases, this is quite unlikely to happen. However, if it does, data structures may be corrupted which could lead to fatal failure and segfault. I detected this via a testbench test, not a user report. But I assume that some users may have had unreproducable aborts that were cause by this bug. | ||||
| * | | | preparing for 5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-20 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254 | ||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-06-16 | 1 | -0/+6 |
| |\| | | |||||
| | * | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-06-16 | 1 | -0/+6 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/datetime.c | ||||
| | | * | bugfix: timestamp was incorrectly calculated for timezones with minute offset | Rainer Gerhards | 2011-06-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271 | ||||
| * | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!) | ||||
| * | | | bugfix/improvement:$WorkDirectory now gracefully handles trailing slashes | Rainer Gerhards | 2011-06-15 | 1 | -0/+1 |
| | | | | |||||
* | | | | preparing for 6.1.9 releasev6.1.9 | Rainer Gerhards | 2011-06-14 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-14 | 1 | -0/+11 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/nsd_gtls.c tcpsrv.c tests/Makefile.am | ||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-06-14 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c | ||||
| | * | | bugfix: memory leak in imtcp & subsystems under some circumstances | Rainer Gerhards | 2011-06-14 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | This leak is tied to error conditions which lead to incorrect cleanup of some data structures. [backport from v6, limited testing under v4] | ||||
| * | | | bugfix: memory leak in imtcp & subsystems under some circumstances | Rainer Gerhards | 2011-06-10 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leak is tied to error conditions which lead to incorrect cleanup of some data structures. Note: this is a backport from v6. In v5, we currently do not have the toolchain to verify the original problem and that it is solved. So this patch is preliminary and subject to change as work progresses. | ||||
* | | | | bugfix: $ActionFileDefaultTemplate did not work | Rainer Gerhards | 2011-06-02 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=262 | ||||
* | | | | preparing for 6.1.8 releasev6.1.8 | Rainer Gerhards | 2011-05-21 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-20 | 1 | -1/+29 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c | ||||
| * | | | preparing for 5.8.1 stablev5.8.1 | Rainer Gerhards | 2011-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | doc: added merged important patch to ChangeLog | Rainer Gerhards | 2011-05-11 | 1 | -0/+10 |
| | | | | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-11 | 1 | -0/+10 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c |