summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-1613-25/+29
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c
| * some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-1614-32/+18
| |
| * Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-12-163-3/+6
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * improved some code based on clang static analyzer resultsRainer Gerhards2010-12-163-3/+6
| | |
| * | typo fix (thanks to Björn Påhlsson for finding it!)Michael Biebl2010-11-302-4/+4
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | Merge branch 'v4.4.2a' into v4-stableRainer Gerhards2010-11-251-5/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imfile/imfile.c runtime/stream.c
| | * | patched version numberRainer Gerhards2010-10-151-1/+1
| | | |
| | * | bugfix: a couple of problems that imfile had on some platformsRainer Gerhards2010-10-152-5/+9
| | | | | | | | | | | | | | | | namely Ubuntu (not their fault, but occured there)
| | * | bugfix: imfile utilizes 32 bit to track offsetRainer Gerhards2010-10-153-4/+12
| | | | | | | | | | | | | | | | | | | | Most importantly, this problem can not experienced on recent Fedora 64 bit OS (which has 64 bit long's!)
| * | | final preparations for releasev4.6.5Rainer Gerhards2010-11-241-1/+1
| | | |
* | | | fixed cosmetic nit (as a result of clang static code analyzer run)Rainer Gerhards2010-12-161-1/+1
| | | |
* | | | bugfix: unitialized variable could cause issues under extreme conditionsRainer Gerhards2010-12-165-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | plus some minor nits. This was found after a clang static code analyzer analysis (great tool, and special thanks to Marcin for telling me about it!)
* | | | preparing for 5.6.2v5.6.2Rainer Gerhards2010-11-303-3/+3
| | | |
* | | | bugfix: replacements for atomic operations for non-int sized types had problems.Rainer Gerhards2010-11-258-126/+201
| | | | | | | | | | | | | | | | | | | | At least one instance of that problem could potentially lead to abort (inside omfile).
* | | | bugfix: atomic increment for msg object may not work correct on all platforms.Chris Metcalf2010-11-252-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | forgot to add to ChangeLogRainer Gerhards2010-11-251-0/+4
| | | |
* | | | streamlined epoll_create() code a little bitRainer Gerhards2010-11-251-2/+5
| | | |
* | | | fixed compile problem in imptcp if no epoll_create1() is presentDavid Hill2010-11-251-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v5.6.0a' into v5-stableRainer Gerhards2010-11-253-3/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | imfile improvementsRainer Gerhards2010-10-274-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures)
* | | | | final cleanup for 5.6.1v5.6.1Rainer Gerhards2010-11-241-1/+1
| | | | |
* | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-11-243-1/+32
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: configure.ac
| * | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-11-243-1/+28
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * | | bugfix(important): problem in TLS handling could cause rsyslog to loopv3.22.3Rainer Gerhards2010-11-243-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in a tight loop, effectively disabling functionality and bearing the risk of unresponsiveness of the whole system. Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
* | | | | bugfix: testbench failed if imptcp was not enabledRainer Gerhards2010-11-052-3/+8
| | | | |
* | | | | provide clear error message if platform does not support imptcpRainer Gerhards2010-11-051-0/+7
| | | | |
* | | | | permitted imptcp to work on systems which support epoll(), but not ↵Rainer Gerhards2010-11-052-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | epoll_create(). Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=204 Thanks to Nicholas Brink for reporting this problem.
* | | | | bugfix: segfault when an *empty* template was usedRainer Gerhards2010-11-052-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=206 Thanks to David Hill for alerting us.
* | | | | bugfix: compile failed with --enable-unlimited-selectvarmojfekoj2010-11-053-1/+5
| |_|/ / |/| | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | fixing a potentially uninitialized variablev5.6.0Rainer Gerhards2010-10-191-1/+1
| | | |
* | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-10-198-372/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c
| * | | fixing some compile problems on FreeBSDRainer Gerhards2010-10-1910-376/+87
| | | |
* | | | fixed testbench compile problem on SolarisRainer Gerhards2010-10-191-1/+3
| | | |
* | | | yet another forgotten testbench fileRainer Gerhards2010-10-221-0/+12
| | | |
* | | | added forgotten testbench fileRainer Gerhards2010-10-221-0/+13
| | | |
* | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-10-221-2/+2
|\| | |
| * | | better error messages in testbenchRainer Gerhards2010-10-221-2/+2
| | | |
* | | | preparing for 5.6.0Rainer Gerhards2010-10-223-2/+13
| | | |
* | | | solved minor compile problem (caused by merge)Rainer Gerhards2010-10-151-1/+0
| | | |
* | | | Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-1526-76/+1539
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-154-10/+35
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/stream.c
| | * | | fixed incomplete mergeRainer Gerhards2010-10-151-0/+1
| | | | |
| | * | | imfile: bugfixes in regard to large files (> 2GB)Rainer Gerhards2010-10-153-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: a couple of problems that imfile had on some platforms, namely Ubuntu (not their fault, but occured there) - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!)
| | * | | minor doc fix: updated tls doc to match new gnutls toolsetTom Bergfeld2010-09-081-1/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | Merge branch 'v4-stable-imptcp' into v4-develRainer Gerhards2010-08-118-20/+87
| |\ \ \ \
| | * | | | imptcp: added $InputPTCPServerAddtlFrameDelimiter directiveRainer Gerhards2010-08-118-12/+78
| | | | | | | | | | | | | | | | | | | | | | | | also improved testbench
| | * | | | fixed minor issue: imptcp did a close(-1) on each acceptRainer Gerhards2010-08-111-1/+2
| | | | | |
| | * | | | imptcp: added $InputPTCPServerNotifyOnConnectionClose directiveRainer Gerhards2010-08-112-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | plus some minor cleanup
| * | | | | Merge branch 'v4-stable-imptcp' into tmpRainer Gerhards2010-08-1119-62/+1434
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
| | * | | | more testbench improvements and new testsRainer Gerhards2010-08-106-58/+107
| | | | | |