summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-16113-1708/+1594
|\ | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-162-1/+23
| |\
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-162-1/+23
| | |\ | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| | | * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-162-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-16111-1707/+1571
| |\| | | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
| | | * license changesRainer Gerhards2012-01-1645-704/+617
| | | |
| | | * runtime license changeRainer Gerhards2012-01-1620-297/+265
| | | |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| | |\|
| | | * license changeRainer Gerhards2012-01-142-35/+30
| | | | | | | | | | | | | | | | after careful consideration of affected code
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1443-647/+645
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | | * more license analysis & changeRainer Gerhards2012-01-1411-178/+163
| | | |
| | | * rsyslog.conf.5 socket module example sb imuxsockJim Hill2012-01-141-1/+1
| | | |
| | | * more files moved to ASL 2.0Rainer Gerhards2012-01-124-66/+58
| | | |
| | | * some more files to ASL 2.0Rainer Gerhards2012-01-117-108/+104
| | | |
| | | * relicense parts under ASL 2.0Rainer Gerhards2012-01-1120-294/+316
| | | | | | | | | | | | | | | | after carful check for copyright holder
| | * | relicense to ASL 2.0Rainer Gerhards2012-01-111-24/+14
| | | |
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-092-5/+7
| |\| |
* | | | omfwd refactor: even more simplification (small one ;))Rainer Gerhards2012-01-141-2/+1
| | | |
* | | | cosmetic: cleanup of ChangeLogRainer Gerhards2012-01-141-2/+0
| | | |
* | | | omfwd license change to ASL 2.0Rainer Gerhards2012-01-141-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | after careful consideration of contributor history. David Lang gave permission to license under ASL 2.0, other patches have been replaced by refactored code.
* | | | omfwd refactor: simplificationRainer Gerhards2012-01-141-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | at the same time, remove commits - 8c3ab2e26f1bae46ff34fc1d0a10a69c4db78127 - 009738a0ac6ba0dccf403f9e396095f44e4f9ac6
* | | | omfwd refactor: simplifying codeRainer Gerhards2012-01-141-21/+9
| | | | | | | | | | | | | | | | also remove code introduced by commit 6e97513eea1a6e282365eb01d972e0657cb36baa
* | | | Merge branch 'v5-devel' into v5-devel-tmpRainer Gerhards2012-01-121-4/+0
|\ \ \ \
| * | | | regression fix: imuxsock-received messages were malformedRainer Gerhards2012-01-121-4/+0
| | | | | | | | | | | | | | | | | | | | probably caused by a recent merge, was not present in 5.9.4
* | | | | part of merge, but forgot to add to merge setRainer Gerhards2012-01-101-0/+3
| | | | |
* | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-104-1/+13
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c
| * | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-104-1/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
| | * | | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-104-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-102-0/+7
| |\| | | | | | |_|_|/ | |/| | |
| | * | | added canned template for ultra-exact sysklogd file formatTomas Heinrich2012-01-102-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the point is that LF will be translated to SP Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-01-092-5/+7
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-092-5/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | Merge v5-stable-newstats & manual ChangeLog updateRainer Gerhards2012-01-091-0/+1
| | | | |
* | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-091-94/+86
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: configure.ac
| * | | | push version numberRainer Gerhards2012-01-091-1/+1
| | | | |
| * | | | imudp: added per-listner stats settings & more refactoringRainer Gerhards2012-01-091-74/+80
| | | | |
| * | | | imudp refactor: field renaming (new names more more sense)Rainer Gerhards2012-01-091-20/+19
| | | | |
| * | | | imudp refactor: regression fixRainer Gerhards2012-01-091-3/+3
| | | | |
| * | | | imudp refactor: fixed socket leakRainer Gerhards2012-01-091-9/+5
| | | | |
| * | | | nit fixed (testing aid removed)Rainer Gerhards2012-01-081-2/+1
| | | | |
| * | | | cleanup of imudp to use better lstn data structure (part I)Rainer Gerhards2012-01-081-68/+60
| | | | |
| * | | | prepared milestone (version push)Rainer Gerhards2011-12-211-1/+1
| | | | |
* | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-206-10/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2011-12-202-3/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-202-0/+3
| | | | |
| | * | | bugfix: imuxsock did truncate part of received message if it did not contain ↵Rainer Gerhards2011-12-202-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295
| * | | | imtcp: added stats countersRainer Gerhards2011-12-203-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also adds counters to other users of tcpsrv.c method, but these do not work if default submit method is overwritten (currently only the case for imdiag, what we don't consider a problem)
| * | | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-202-0/+3
| | | | |
* | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-0/+17
|\| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-07 00:46:56 +0000