summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-181-0/+9
|\
| * removed debug code from action.c and runtime/queue.c after testingAndre Lorbach2011-08-181-4/+0
| * bugfix: fixed incorrect state handling for Discard Action (transactions)Andre Lorbach2011-08-181-0/+13
* | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-161-2/+10
|\|
| * Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-121-0/+5
| * bugfixes for tag emulationRainer Gerhards2011-08-111-2/+5
* | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-111-1/+1
|\|
| * Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTagAndre Lorbach2011-08-101-1/+1
* | Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into v5-d...Andre Lorbach2011-08-103-6/+28
|\ \
| * \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-091-1/+1
| |\ \
| * | | added capability to emit config error location info for warningsRainer Gerhards2011-08-093-6/+28
* | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-102-4/+11
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'v5-stable-msgidfix' into v5-stableAndre Lorbach2011-08-101-3/+10
| |\ \ | | |/ | |/|
| | * Cosmetic changeAndre Lorbach2011-07-271-2/+2
| | * Fixed a stupid return bug introduced by the last commitAndre Lorbach2011-07-271-1/+2
| | * Experimentally added mutex lock in getMSGID in order to fix bug 275.Andre Lorbach2011-07-261-3/+9
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-091-1/+1
| |\ \
| | * | bugfix: memcpy overflow can occur in allowed sender checkingMarius Tomaschewski2011-08-091-1/+1
| | * | Merge branch 'v3-stable' into v4-stableAndre Lorbach2011-08-051-7/+7
| | |\ \
| | | * | bugfix: potential misadressing in property replacerAndre Lorbach2011-08-051-7/+7
* | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-7/+9
|\| | | |
| * | | | bugfix: potential misadressing in property replacerAndre Lorbach2011-08-051-7/+9
| | |_|/ | |/| |
| * | | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-111-0/+1
* | | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-061-0/+1
* | | | cosmetic: reformatted some codeRainer Gerhards2011-06-301-12/+5
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-212-5/+8
|\| | |
| * | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2Rainer Gerhards2011-06-211-4/+8
| * | | bugfix: problems in failover action handlingRainer Gerhards2011-06-201-1/+0
* | | | added support for obtaining timestamp from system for imuxsockRainer Gerhards2011-06-202-35/+47
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-164-6/+34
|\| | |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-161-1/+1
| |\| |
| | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-06-161-1/+1
| | |\|
| | | * bugfix: timestamp was incorrectly calculated for timezones with minute offsetRainer Gerhards2011-06-161-1/+1
| * | | bugfix: problems in failover action handlingRainer Gerhards2011-06-161-3/+9
| * | | bugfix/improvement:$WorkDirectory now gracefully handles trailing slashesRainer Gerhards2011-06-152-1/+23
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-142-0/+7
|\| | |
| * | | bugfix: TLS-induced smaller memory still existed, now fixedRainer Gerhards2011-06-141-0/+3
| * | | bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-101-0/+1
| * | | somewhat improved debug loggingRainer Gerhards2011-06-101-0/+6
* | | | Merge branch 'v4-devel' into v5-develRainer Gerhards2011-06-141-0/+3
|\ \ \ \
| * \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-06-141-0/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-141-0/+3
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-111-2/+6
| |\| | |
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-092-11/+23
| |\ \ \ \
| * | | | | bugfix: a slightly more informative error message when a TCPRainer Gerhards2011-05-021-2/+4
| * | | | | bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-241-3/+3
* | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-112-1/+11
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-111-1/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | bugfix: invalid processing in QUEUE_FULL conditionRainer Gerhards2011-05-111-2/+6
| | | |/ / | | |/| |
| * | | | bugfix: $LocalHostName was not honored under all circumstancesRainer Gerhards2011-05-091-0/+6