summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta' into masterRainer Gerhards2010-03-012-7/+31
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| * Merge branch 'v4-stable' into tmpRainer Gerhards2010-03-012-7/+31
| |\
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-03-011-7/+30
| | |\ | | | | | | | | | | | | | | | | Conflicts: runtime/ctok.c
| | | * bugfix: comment char ('#') in literal terminated script parsingRainer Gerhards2010-03-011-7/+30
| | | | | | | | | | | | | | | | | | | | ...and thus could not be used. but tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=119
| | * | cleanup: removed debug messages that accidently made it into the commitRainer Gerhards2010-03-012-2/+1
| | | |
| | * | make $ActonFileDefaultTemplate available to ompipeRainer Gerhards2010-03-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was not honored by the new ompipe module, because it is a local file directive (it was applied to pipes as a side-effect of using the same module for pipes and files...). I now made this a global, so that semantics are the same as previously. Not really nice, but probably the best thing to do in the current situation (everything else would involve much more overhead --- leave that for the new config system).
| * | | Merge branch 'v4-stable' into 'v5-beta'Rainer Gerhards2010-02-252-6/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
* | | | Merge branch 'v4-beta' into masterRainer Gerhards2010-02-242-6/+13
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: doc/manual.html tools/syslogd.c
| * | | message parser fixes and testbench enhancementsRainer Gerhards2010-02-222-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - improved testbench to contain samples for totally malformed messages which miss parts of the message content - bugfix: some malformed messages could lead to a missing LF inside files or some other missing parts of the template content. - bugfix: if a message ended immediately with a hostname, the hostname was mistakenly interpreted as TAG, and localhost be used as hostname
| * | | bugfix: message without MSG part could case a segfaultRainer Gerhards2010-02-221-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [backported from v5 commit 98d1ed504ec001728955a5bcd7916f64cd85f39f] This actually was a "recent" regression, but I did not realize that it was introduced by the performance optimization in v4-devel. Shame on me for having two devel versions at the same time...
* | | | Merge branch 'beta' into masterRainer Gerhards2010-02-101-44/+58
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: ChangeLog tests/parsertest.sh
| * | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-101-44/+58
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c template.c tests/Makefile.am tests/parsertest.sh
| | * | several bugfixes for the property replacerRainer Gerhards2010-02-081-44/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: property replacer returned invalid parameters under some (unusual) conditions. In extreme cases, this could lead to garbled logs and/or a system failure. - bugfix: invalid length returned (often) when using regular expressions inside the property replacer - bugfix: submatch regex in property replacer did not honor "return 0 on no match" config case
* | | | Merge branch 'beta'Rainer Gerhards2010-02-042-3/+8
|\| | |
| * | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-042-3/+8
| |\| |
| | * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-02-042-3/+8
| | |\ \
| | | * | bugfix: several smaller bugs resolved after flexelint reviewvarmojfekoj2010-02-043-4/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | | * | bugfix: potential segfault on queue shutdownvarmojfekoj2010-01-261-9/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | patch to make rsyslog compile under Apple OS Xtrey2010-02-032-1/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | replaced data type "bool" by "sbool" because this created some portability ↵Rainer Gerhards2010-02-0211-44/+44
| | | | | | | | | | | | | | | | | | | | issues
* | | | | added $Escape8BitCharactersOnReceive directiveRainer Gerhards2010-01-271-0/+14
| | | | | | | | | | | | | | | | | | | | Thanks to David Lang for suggesting this functionality.
* | | | | Merge branch 'beta'Rainer Gerhards2010-01-261-1/+2
|\| | | |
| * | | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-261-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| | * | | did some adoptions necessary to use the bugfix with v4-beta code baseRainer Gerhards2010-01-261-6/+6
| | | | |
| | * | | Merge branch 'queuepatch' into v4-betanewRainer Gerhards2010-01-261-10/+15
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| | | * | | bugfixes for potential segfaults during queue shutdownvarmojfekoj2010-01-261-9/+14
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | (bugs require certain non-standard settings to appear) Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | bugfix: blanks inside file names did not terminate file name parsing.Rainer Gerhards2010-01-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could reslult in the whole rest of a line (including comments) to be treated as file name in "write to file" actions. Thanks to Jack for reporting this issue.
* | | | | Merge branch 'beta'Rainer Gerhards2010-01-192-4/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-152-4/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | bugfix: rsyslog hangs when writing to a named pipe which nobody was reading.Rainer Gerhards2010-01-152-4/+12
| | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for reporting this bug.
* | | | | Merge branch 'beta'Rainer Gerhards2009-11-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | Merge branch 'v4-beta' into betaRainer Gerhards2009-11-301-1/+1
| |\| | |
| | * | | bugfix: hostname accidently set to IP address for some message sourcesRainer Gerhards2009-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | for example imudp. Thanks to Anton for reporting this bug.
* | | | | re-implemented $EscapeControlCharacterTab config directiveRainer Gerhards2009-11-271-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Based on Jonathan Bond-Caron's patch for v4. This now also includes some automatted tests.
* | | | | Merge branch 'beta' into masterRainer Gerhards2009-11-261-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html doc/rsyslog_conf_modules.html tests/sndrcv_drvr.sh
| * | | | Merge branch 'v4-beta' into betaRainer Gerhards2009-11-253-3/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html tests/Makefile.am tests/sndrcv_drvr.sh
| | * | | bugfix (kind of): check if TCP connection is still alive if using TLSJonathan Bond-Caron2009-11-251-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | enhanced module debug outputRainer Gerhards2009-11-251-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | ... and addes some (later-to-be-removed) debug code to support finding a problem in transaction handling.
* | | | | solved some platform issues with nsdpoll_ptcpRainer Gerhards2009-11-253-3/+9
| | | | |
* | | | | Merge branch 'nspoll'Rainer Gerhards2009-11-2510-3/+638
|\ \ \ \ \
| * | | | | fixing some potential segfault conditionsRainer Gerhards2009-11-253-6/+15
| | | | | |
| * | | | | milestone commit: first working version with epoll/tcpRainer Gerhards2009-11-234-14/+54
| | | | | | | | | | | | | | | | | | | | | | | | ... but not well-tested, so there may be many hidden bugs.
| * | | | | milestone: working towards utilizing epoll interfaceRainer Gerhards2009-11-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | NOTE: this version does NOT run - tcp-based servers are defunct.
| * | | | | milestone commit: first driver layer call doneRainer Gerhards2009-11-189-16/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... does not really run. We can now call into the epoll driver, but not handle epoll(). The driver also needs more modifications.
| * | | | | added skeleton for supporting epoll() API in netstream subsystemRainer Gerhards2009-11-187-2/+433
| | | | | |
* | | | | | Merge branch 'v4-devel' into tmpRainer Gerhards2009-11-202-2/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tests/sndrcv_drvr.sh tools/syslogd.c
| * | | | | debugondemand mode caused backgrounding to failRainer Gerhards2009-11-202-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is close to a bug, but I'd consider the ability to background in this mode a new feature...
* | | | | | minor: moved all code to new isAllowedSender2() interfaceRainer Gerhards2009-11-171-1/+1
| | | | | |
* | | | | | Merge branch 'v4-devel'Rainer Gerhards2009-11-178-13/+121
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_modules.html gss-misc.c plugins/imgssapi/imgssapi.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c
| * | | | | worked a bit on "unlimited select()" patchRainer Gerhards2009-11-172-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - potential segfault in gss-misc.c - glbl interface needed different version ID - some compile time warning cleanup