Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | preparing for 5.9.3 releasev5.9.3 | Rainer Gerhards | 2011-08-31 | 2 | -2/+2 |
| | |||||
* | cosmetic: adding imported bugfix to ChangeLog | Rainer Gerhards | 2011-08-31 | 1 | -1/+2 |
| | |||||
* | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-31 | 3 | -25/+25 |
|\ | |||||
| * | bugfix: mark message processing did not work correctly | Rainer Gerhards | 2011-08-31 | 3 | -25/+25 |
| | | |||||
* | | Merge branch 'v4-beta' into v5-devel | Rainer Gerhards | 2011-08-30 | 1 | -0/+12 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * \ | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-30 | 2 | -4/+6 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | Added changelog entry | Andre Lorbach | 2011-08-11 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-11 | 2 | -1/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-09 | 2 | -1/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-05 | 3 | -14/+23 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | preparing for 4.7.4v4.7.4 | Rainer Gerhards | 2011-07-11 | 3 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | issue a warning message for old-style dynafile action | Rainer Gerhards | 2011-07-11 | 3 | -1/+28 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-07-11 | 14 | -29/+58 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
* | \ \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-30 | 2 | -7/+9 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-08-30 | 2 | -6/+7 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/syslogd.c | ||||
| | * | | | | | | added bug info to ChangeLog | Rainer Gerhards | 2011-08-30 | 1 | -2/+3 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'v4-stable-rhel-bug' into v4-stable | Rainer Gerhards | 2011-08-30 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | bugfix: off-by-one(two) bug in legacy syslog parser | Rainer Gerhards | 2011-08-10 | 1 | -1/+1 |
| | | | |_|_|/ | | | |/| | | | |||||
| | * / | | | | Added MsgDup bugfix from v5-stable into v4-stable branch | Andre Lorbach | 2011-08-11 | 2 | -1/+2 |
| | |/ / / / | |||||
* | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-18 | 4 | -3/+28 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: 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' into v5-devel | Andre Lorbach | 2011-08-16 | 5 | -6/+18 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | | 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 v5-devel | 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-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into ↵ | Andre Lorbach | 2011-08-10 | 5 | -6/+35 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | v5-devel | ||||
| * \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-09 | 2 | -1/+7 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | added capability to emit config error location info for warnings | Rainer Gerhards | 2011-08-09 | 5 | -6/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location. | ||||
* | | | | | | | | Added changelog entry for bugid 275 | Andre Lorbach | 2011-08-10 | 1 | -0/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-10 | 3 | -4/+20 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | 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 |
| | | | | | | | |||||
| * | | | | | | 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 v5-devel | Andre Lorbach | 2011-08-05 | 4 | -15/+29 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | |