summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into masterRainer Gerhards2012-01-18100-1502/+1418
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
| * preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-173-3/+5
| |
| * licensing updateRainer Gerhards2012-01-161-17/+16
| |
| * 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 '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
| | |
* | | finally cleaning up the syslog-ng rsyslog comparisonRainer Gerhards2012-01-091-112/+123
| | | | | | | | | | | | | | | this page should be removed from the doc set over time -- it really does not belong here.
* | | removed imtemplate/omtemplate template modules, as this was waste of timeRainer Gerhards2012-01-097-770/+5
| | | | | | | | | | | | | | | | | | The actual input/output modules are better copy templates. Instead, the now-removed modules cost time for maintenance AND often caused confusion on what their role was.
* | | Merge branch 'v6-stable'Rainer Gerhards2012-01-092-5/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | final prep for 6.2.0v6.2.0Rainer Gerhards2012-01-092-2/+2
| | | |
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-094-7/+19
| |\| |
| | * | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-092-5/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | begin preparing for v6-stableRainer Gerhards2012-01-091-1/+1
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-01-096-43/+12
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v6compatibility.html
| * | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-096-44/+11
| | | | | | | | | | | | | | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. -------------------------
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-206-10/+34
|\ \ \ \
| * \ \ \ 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-devel'Rainer Gerhards2011-12-199-14/+100
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-0/+17
| |\| | | |
| | * | | | imudp: stats addedRainer Gerhards2011-12-191-0/+17
| | | | | |
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-192-7/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | | | better performance for action stats & cleanup: removing debug printsRainer Gerhards2011-12-192-7/+6
| | | | | |
| | * | | | flagged special branch versionRainer Gerhards2011-12-191-1/+1
| | | | | |
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-192-0/+6
| |\| | | |
| | * | | | additional counter for lost messages due to failed actions addedRainer Gerhards2011-12-192-0/+6
| | | | | |
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-198-12/+73
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c
| | * | | | added instrumentationRainer Gerhards2011-12-196-6/+64
| | |/ / /
| * | | | fixing memory leak in new stats code (delete statsobj)Rainer Gerhards2011-12-161-0/+6
| | | | |
| * | | | experimental: added first stats counter to action objectRainer Gerhards2011-12-163-7/+47
| | | | |
| * | | | more work on queue statistics counterRainer Gerhards2011-12-164-8/+15
| | | | |
| * | | | new stats counter "discarded" for queue objectRainer Gerhards2011-12-164-1/+11
| | | | | | | | | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition.
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-165-49/+250
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c
| * | | | enhanced module loader to not rely on PATH_MAXRainer Gerhards2011-12-162-34/+49
| | | | |
| * | | | preparing for 5.9.4v5.9.4Rainer Gerhards2011-11-293-3/+3
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 10:50:28 +0000