summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | cosmetic: removed autoconf warning messagesRainer Gerhards2012-06-041-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | preparing for 6.3.10Rainer Gerhards2012-06-043-3/+13
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-042-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into betaRainer Gerhards2012-06-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-beta' into betaRainer Gerhards2012-06-014-13/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | doc: mentioning imported bugfix in ChangeLogRainer Gerhards2012-06-011-0/+7
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-014-13/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | | | | | | | | | | | | | | Skip tests that require root if euid != 0Miloslav Trmač2012-05-314-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will mark them as SKIPPED instead of FAILED, making it at least in theory possible to get 0 FAILED tests even when running as an unprivileged user.
| * | | | | | | | | | | | | | | Don't run valgrind tests if imdiag is not enabledMiloslav Trmač2012-05-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Valgrind tests depend on imdiag as well.
| * | | | | | | | | | | | | | | Add ylwrap to .gitignoreMiloslav Trmač2012-05-311-0/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | bugfix: invalid free in imptcp could lead to abort during startupRainer Gerhards2012-05-292-0/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-295-4/+57
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-295-3/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-101-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | | | | | | | | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-102-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and full delayable sources somewhat smarter and permits, assuming sufficient timouts, to persist message up to the max queue capacity. Also some nits debug instrumentation have been fixed.
| * | | | | | | | | | | | | | | | | preparing for 6.3.9 (beta) releasev6.3.9Rainer Gerhards2012-05-223-3/+3
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | tcpsrv: cleaned up patch, works now with multiple users as wellRainer Gerhards2012-05-181-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: "users" means modules, like imtcp and imdiag. NOT real users or devices.
| * | | | | | | | | | | | | | | | | regression: tcpsrv.c always activated first worker, what lead to hangRainer Gerhards2012-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... if more than 3 fds were to be read at the same time.
| * | | | | | | | | | | | | | | | | bugfix: imtcp could cause hang during receptionRainer Gerhards2012-05-162-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this also applied to other users of core file tcpsrv.c, but imtcp was by far the most prominent and widely-used, the rest rather exotic (like imdiag) NOTE: this patch is probably not 100% correct and may cause problems if multiple tcpsrv.c users existing within a configuration. The next step is to evaluate this and probably slightly change the worker thread startup/shutdown location.
| * | | | | | | | | | | | | | | | | minor issue: tcpsrv did not decrement wrkr cnt on shutdownRainer Gerhards2012-05-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am not really sure if that is an issue at all, at least it is inconsistent.
| * | | | | | | | | | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-05-102-12/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-beta'Rainer Gerhards2012-05-103-15/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | | | | | | | | | | | | Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-betaRainer Gerhards2012-05-103-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | preparing for 5.9.7v5.9.7Rainer Gerhards2012-05-103-3/+3
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-103-15/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-035-9/+110
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | | | | | | | | | | | | | | cosmetic: new version in ChangeLogRainer Gerhards2012-04-271-0/+2
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable-field-substring' into v5-betaRainer Gerhards2012-04-276-73/+107
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-275-63/+97
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | cleanup no longer used variableRainer Gerhards2012-05-031-1/+0
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-05-035-18/+129
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| * | | | | | | | | | | | | | | | | | | | | | bugfix/omfile: template action parameter was not acceptedRainer Gerhards2012-05-032-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (and template name set to "??" if the parameter was used) Thanks to Brian Knox for alerting us on this bug.
| * | | | | | | | | | | | | | | | | | | | | | better debug instrumentation --> input thread names used for reportingRainer Gerhards2012-05-023-8/+32
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-fieldext'Rainer Gerhards2012-04-265-63/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-265-63/+97
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | cleanup: removed unused but set parametersRainer Gerhards2012-04-235-10/+4
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | bugfix: omudpspoof did not work correctly if no spoof hostname was configuredRainer Gerhards2012-04-232-1/+3
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | bugfix: number conversion in expression evaluation was not always correctRainer Gerhards2012-04-231-2/+4
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was invalid when the property was no string. Currently all props are strings, so this bug never could hit in practice.
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-beta'Rainer Gerhards2012-04-191-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imptcp/imptcp.c
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-192-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-191-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | doc: add last bugfix to changelogRainer Gerhards2012-04-192-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and bump up version
| | | * | | | | | | | | | | | | | | | | | | | | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config directive was accepted, but had no effect
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-184-5/+45
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-184-5/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c
| * | | | | | | | | | | | | | | | | | | | | | | | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-195-59/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-186-5/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h
| * | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/imuxsock: configured hostname was not usedRainer Gerhards2012-04-162-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/imuxsock: solving abort if hostname was not setRainer Gerhards2012-04-162-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | |