summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* preparing for 6.1.9 releasev6.1.9Rainer Gerhards2011-06-143-4/+4
|
* Merge branch 'v5-stable' into betaRainer Gerhards2011-06-148-5/+67
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/nsd_gtls.c tcpsrv.c tests/Makefile.am
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-141-0/+3
| |\ | | | | | | | | | | | | Conflicts: tcpsrv.c
| | * bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-143-4/+12
| | | | | | | | | | | | | | | This leak is tied to error conditions which lead to incorrect cleanup of some data structures. [backport from v6, limited testing under v4]
| * | bugfix: TLS-induced smaller memory still existed, now fixedRainer Gerhards2011-06-141-0/+3
| | |
| * | backporting TLS-based testRainer Gerhards2011-06-143-0/+43
| | |
| * | backported current tcpflood testing toolRainer Gerhards2011-06-142-55/+557
| | | | | | | | | | | | so that we can improve v5's testbench as well
| * | bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-103-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | somewhat improved debug loggingRainer Gerhards2011-06-101-0/+6
| | |
* | | bugfix: $ActionFileDefaultTemplate did not workRainer Gerhards2011-06-022-5/+9
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=262
* | | preparing for 6.1.8 releasev6.1.8Rainer Gerhards2011-05-215-2/+15
| | |
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-05-2012-10/+594
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-201-5/+0
| |\|
| | * cleanup: removed useless & undocumented config directive from imrelpRainer Gerhards2011-05-201-5/+0
| | |
| * | preparing for 5.8.1 stablev5.8.1Rainer Gerhards2011-05-193-3/+3
| | |
| * | omlibdbi: added necessary includeRainer Gerhards2011-05-121-0/+1
| | |
| * | mmsnmptrapd: removed unnecessary includesRainer Gerhards2011-05-121-3/+0
| | |
| * | doc: added merged important patch to ChangeLogRainer Gerhards2011-05-111-0/+10
| | |
| * | minor: made diagtalker output more clearRainer Gerhards2011-05-111-0/+3
| | | | | | | | | | | | prevents confusion during testbench run
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-112-1/+15
| |\| | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * bugfix: invalid processing in QUEUE_FULL conditionRainer Gerhards2011-05-112-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the the multi-submit interface was used and a QUEUE_FULL condition occured, the failed message was properly destructed. However, the rest of the input batch, if it existed, was not processed. So this lead to potential loss of messages and a memory leak. The potential loss of messages was IMHO minor, because they would have been dropped in most cases due to the queue remaining full, but very few lucky ones from the batch may have made it. Anyhow, this has now been changed so that the rest of the batch is properly tried to be enqueued and, if not possible, destructed.
| * | undo accidental removal of a componentRainer Gerhards2011-05-101-0/+6
| | |
| * | Merge branch 'v5-stable-snmptrapd' into v5-stableRainer Gerhards2011-05-109-6/+573
| |\ \
| | * | mmsnmptrapd: added doc & mentioned in ChangeLogRainer Gerhards2011-05-105-6/+110
| | | |
| | * | Merge branch 'v5-stable' into v5-stable-snmptrapdRainer Gerhards2011-05-092-0/+8
| | |\ \
| | * | | cosmetic cleanupRainer Gerhards2011-05-091-2/+0
| | | | |
| | * | | mmsnmptrapd: added capability to specify severity mappingRainer Gerhards2011-05-091-2/+154
| | | | |
| | * | | mmsnmptrap: added TAG processingRainer Gerhards2011-05-061-1/+77
| | | | |
| | * | | added skeleton for mmsnmptrapdRainer Gerhards2011-05-054-0/+237
| | | | |
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-05-098-9/+63
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfwd.c
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-092-2/+6
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | bugfix: invalid storage type for config variablesRainer Gerhards2011-05-092-1/+2
| | | |
| | * | bugfix: stream driver mode was not correctly set on tcp ouput on big endian ↵Tomas Heinrich2011-05-092-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | systems. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | bugfix: $LocalHostName was not honored under all circumstancesRainer Gerhards2011-05-092-0/+8
| | |/ | |/| | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=258
| * | added imported patch to ChangeLogRainer Gerhards2011-05-031-0/+6
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-032-0/+17
| |\|
| | * bugfix: memory and file descriptor leak in stream processingRainer Gerhards2011-05-032-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Leaks could occur under some circumstances if the file stream handler errored out during the open call. Among others, this could cause very big memory leaks if there were a problem with unreadable disk queue files. In regard to the memory leak, this closes: http://bugzilla.adiscon.com/show_bug.cgi?id=256
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-022-1/+6
| |\| | | | | | | | | | | | | Conflicts: tcpsrv.c
| | * bugfix: TCP connection invalidly aborted when messages needed to be discardedRainer Gerhards2011-05-022-1/+3
| | | | | | | | | | | | due to QUEUE_FULL or similar problem
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-022-2/+6
| |\| | | | | | | | | | | | | Conflicts: tcpsrv.c
| | * slightly more informative errmsg when TCP connection is abortedRainer Gerhards2011-05-023-5/+11
| | |
| * | bugfix: rate-limiting inside imuxsock did not work 100% correctRainer Gerhards2011-04-272-2/+12
| | | | | | | | | | | | | | | | | | | | | reason was that a global config variable was invalidly accessed where a listener variable should have been used. Also performance-improved the case when rate limiting is turned off (this is a very unintrusive change, thus done directly to the stable version).
| * | bugfix(minor): improper template function call in syslogd.cRainer Gerhards2011-04-192-1/+2
| | |
* | | bug: configure needs a check for more recent liblognormRainer Gerhards2011-04-181-1/+1
| | |
* | | preparing for 6.1.7v6.1.7Rainer Gerhards2011-04-153-3/+4
| | |
* | | Merge branch 'v5-devel'Rainer Gerhards2011-04-159-15/+70
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c
| * | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-04-159-15/+67
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | added imported bugfix to changelogRainer Gerhards2011-04-151-0/+3
| | | |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-04-153-2/+16
| | |\|
| | | * bugfix: IPv6-address could not be specified in omrelpRainer Gerhards2011-04-143-2/+16
| | | | | | | | | | | | | | | | | | | | this was due to improper parsing of ":" closes: http://bugzilla.adiscon.com/show_bug.cgi?id=250