Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 6 | -7/+47 |
|\ | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | removed debug code from action.c and runtime/queue.c after testing | Andre Lorbach | 2011-08-18 | 2 | -21/+0 |
| | | |||||
| * | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 4 | -3/+49 |
| | | |||||
| * | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Andre Lorbach | 2011-08-12 | 1 | -2/+2 |
| |\ | |||||
| | * | minor doc: made body tag parsable for web site scripts | Rainer Gerhards | 2011-08-12 | 1 | -2/+2 |
| | | | |||||
| * | | Added debug output into message parsers needed for bugtracking | Andre Lorbach | 2011-08-12 | 3 | -1/+8 |
| |/ | | | | | | | Changed version to 5.8.5-pre1 | ||||
| * | bugfixes for tag emulation | Rainer Gerhards | 2011-08-11 | 2 | -3/+8 |
| | | | | | | | | | | - 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 | 2 | -2/+6 |
|\| | | | | | | | | | | | | | 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 |
| | | |||||
| * | Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTag | Andre Lorbach | 2011-08-10 | 1 | -1/+1 |
| | | | | | | | | | | The syslogtag of the duplicated message could get contain garbage at the end as the string terminating NULL Byte was missing. | ||||
| * | preparing for version 5.8.4v5.8.4 | root | 2011-08-10 | 3 | -3/+3 |
| | | |||||
* | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-10 | 2 | -3/+13 |
|\| | |||||
| * | Added changelog entry for bugid 275 | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
| | | |||||
| * | Merge branch 'v5-stable-msgidfix' into v5-stable | Andre Lorbach | 2011-08-10 | 1 | -3/+10 |
| |\ | |||||
| | * | Cosmetic change | Andre Lorbach | 2011-07-27 | 1 | -2/+2 |
| | | | |||||
| | * | Fixed a stupid return bug introduced by the last commit | Andre Lorbach | 2011-07-27 | 1 | -1/+2 |
| | | | |||||
| | * | Experimentally added mutex lock in getMSGID in order to fix bug 275. | Andre Lorbach | 2011-07-26 | 1 | -3/+9 |
| | | | |||||
* | | | 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 | 2 | -1/+7 |
|\| | | |||||
| * | | 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 | 2 | -1/+4 |
| |\ \ | |||||
| | * | | bugfix: memcpy overflow can occur in allowed sender checking | Marius Tomaschewski | 2011-08-09 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...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 | 3 | -8/+20 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -7/+11 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| | | * | | bugfix: potential misadressing in property replacer | Andre Lorbach | 2011-08-05 | 2 | -7/+8 |
| | | | | | |||||
| * | | | | Added changelog entry | Andre Lorbach | 2011-08-05 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | bugfix: potential misadressing in property replacer | Andre Lorbach | 2011-08-05 | 1 | -7/+9 |
| | |_|/ | |/| | | |||||
| * | | | doc: cleanup of copy-and-paste error in comment | Rainer Gerhards | 2011-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | thanks to darix for alerting me | ||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
| |\| | | |||||
* | | | | Merge branch 'v4-stable' into beta | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | doc: updated rsyslog.conf man page with new syntaxes | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
| | | | | |||||
* | | | | preparing for 6.1.11v6.1.11 | Rainer Gerhards | 2011-07-11 | 3 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-11 | 7 | -12/+48 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | preparing for 5.8.3v5.8.3 | Rainer Gerhards | 2011-07-11 | 3 | -3/+6 |
| | | | | |||||
| * | | | added warning message for old-style outchannel syntax | Rainer Gerhards | 2011-07-11 | 3 | -1/+28 |
| | | | | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 5 | -6/+16 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh | ||||
| | * | | preparing for 4.6.7 releasev4.6.7 | Rainer Gerhards | 2011-07-11 | 8 | -15/+16 |
| | | | | |||||
| | * | | support for :omfile: forward compatibility directive | Rainer Gerhards | 2011-07-11 | 3 | -3/+11 |
| | | | | |||||
* | | | | issue a warning if old omusrmsg action syntax is used | Rainer Gerhards | 2011-07-06 | 2 | -2/+11 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-06 | 7 | -19/+48 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 5 | -11/+23 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | added support for the ":omusrmsg:" syntax in configuring user messages | Rainer Gerhards | 2011-07-06 | 3 | -8/+19 |
| | | | | |||||
| | * | | doc: ./configure --help invalidly showed imdiag enabled by default | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Thanks to Frédéric L. W. Meunier for bringing this to my attention. | ||||
| | * | | preparing for 4.6.6v4.6.6 | Rainer Gerhards | 2011-06-24 | 3 | -3/+3 |
| | | | | |||||
| * | | | doc: mentioned Lennart's patch in ChangeLog | Rainer Gerhards | 2011-07-02 | 1 | -0/+3 |
| | | | | |||||
| * | | | systemd: direct stdout/stderr of rsyslog to null | Lennart Poettering | 2011-07-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows systemd upstream to set stdout/stderr of all spawned services by default to 'syslog'. In order to avoid log loops rsyslog itself must be have its stdout/stderr connected to 'null' in that case, however. | ||||
| * | | | reduced sporadic failures during make check | Rainer Gerhards | 2011-06-30 | 1 | -9/+14 |
| | | | | | | | | | | | | | | | | backport from v6 | ||||
* | | | | prepare for 6.1.10v6.1.10 | Rainer Gerhards | 2011-06-22 | 3 | -2/+14 |
| | | | |