Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Rainer Gerhards | 2010-02-04 | 1 | -0/+3 |
|\ | |||||
| * | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-02-04 | 1 | -0/+3 |
| |\ | |||||
| | * | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2010-02-04 | 1 | -0/+3 |
| | |\ | |||||
| | | * | bugfix: several smaller bugs resolved after flexelint review | varmojfekoj | 2010-02-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2010-02-03 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html | ||||
| * | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-02-03 | 1 | -1/+5 |
| |\| | | |||||
| | * | | (slightly) enhanced support for FreeBSD by setting _PATH_MODDIR to the ↵ | Cristiano | 2010-02-03 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | correct value on FreeBSD. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | backporting bugfixes from 5.2.2 | Rainer Gerhards | 2010-01-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: queues in direct mode could case a segfault, especially if an action failed for action queues. The issue was an invalid increment of a stack-based pointer which lead to destruction of the stack frame and thus a segfault on function return. Thanks to Michael Biebl for alerting us on this problem. [backport from 5.5.2] - bugfix: wrong memory assignment for a config variable (probably without causing any harm) [backport from 5.2.2] | ||||
* | | | | replaced data type "bool" by "sbool" because this created some portability ↵ | Rainer Gerhards | 2010-02-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | issues | ||||
* | | | | fixed small misalignment | Rainer Gerhards | 2010-01-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2010-01-26 | 1 | -0/+1 |
|\| | | | |||||
| * | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-01-26 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c | ||||
| | * | | bugfix: -d did not enable display of debug messages | Rainer Gerhards | 2010-01-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | regression from introduction of "debug on demand" mode Thanks to Michael Biebl for reporting this bug | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2010-01-19 | 2 | -8/+18 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-01-19 | 1 | -2/+2 |
| |\| | | |||||
| | * | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2010-01-19 | 1 | -2/+2 |
| | |\| | |||||
| | | * | Fix a typo regarding syslog.h and syslog(3) | Michael Biebl | 2010-01-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-01-15 | 1 | -6/+16 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | bugfix: rsyslog hangs when writing to a named pipe which nobody was reading. | Rainer Gerhards | 2010-01-15 | 1 | -6/+16 |
| | | | | | | | | | | | | | | | | Thanks to Michael Biebl for reporting this bug. | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2010-01-12 | 1 | -0/+6 |
|\| | | | |||||
| * | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-01-12 | 1 | -0/+6 |
| |\| | | |||||
| | * | | fixed a memory leak when sending messages in zip-compressed format | Naoya Nakazawa | 2010-01-11 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | worked around an issue where omfile failed to compile on 32 bit platforms | Rainer Gerhards | 2009-12-09 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | ...under some circumstances (this smells like a gcc problem, but a simple solution was available). Thanks to Kenneth Marshall for some advice. [backported from 5.5.x branch] | ||||
| * | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2009-12-04 | 1 | -0/+1 |
| |\| | | |||||
* | | | | Merge branch 'v4-devel' | Rainer Gerhards | 2009-12-04 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-12-04 | 1 | -0/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-12-04 | 1 | -0/+1 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-12-04 | 1 | -0/+1 |
| | | |\ \ | |||||
| | | | * | | bugfix: potential segfault when -p command line option was used | Rainer Gerhards | 2009-12-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | thanks to varmojfekoj for pointing me at this bug | ||||
| * | | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-30 | 1 | -1/+1 |
| |\| | | | | |||||
| | * | | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-11-30 | 1 | -1/+1 |
| | |\| | | | |||||
| * | | | | | added $EscapeControlCharacterTab config directive | Jonathan Bond-Caron | 2009-11-27 | 1 | -4/+6 |
| | | | | | | |||||
* | | | | | | worked around an issue where omfile failed to compile on32 bit platforms | Rainer Gerhards | 2009-12-02 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | under some circumstances (this smells like a gcc problem, but a simple solution was available). Thanks to Kenneth Marshall for some advice. | ||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2009-11-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2009-11-30 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2009-11-30 | 2 | -3/+3 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_modules.html | ||||
| | | * | | | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-11-30 | 1 | -1/+1 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | bugfix: $CreateDirs variable not properly initialized | Rainer Gerhards | 2009-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | default thus was random (but most often "on") | ||||
| | * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2009-11-12 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2009-11-25 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html tests/Makefile.am tests/sndrcv_drvr.sh | ||||
* | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2009-11-25 | 1 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | | bugfix: omfile output was only written when buffer was full | Rainer Gerhards | 2009-11-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... not at end of transaction. | ||||
* | | | | | | | | Merge branch 'v4-devel' into tmp | Rainer Gerhards | 2009-11-20 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tests/sndrcv_drvr.sh tools/syslogd.c | ||||
| * | | | | | | | debugondemand mode caused backgrounding to fail | Rainer Gerhards | 2009-11-20 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is close to a bug, but I'd consider the ability to background in this mode a new feature... | ||||
* | | | | | | | | Merge branch 'v4-devel' | Rainer Gerhards | 2009-11-17 | 1 | -2/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-17 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-11-17 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | * | | | | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-11-17 | 1 | -2/+2 |
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | / | | | | | |_|/ | | | | |/| | | | | | | | | | Conflicts: doc/rsyslog_conf.html runtime/net.c | ||||
| | | | * | | | correcting -q/-Q patch - was invalid | Rainer Gerhards | 2009-11-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the correct patch. The previous one solved the segfault, but disabled the -q/Q options. | ||||
| * | | | | | | integrating varmojfekoj's "unlimited select()" patch into v4-devel | Rainer Gerhards | 2009-11-17 | 1 | -0/+3 |
| |\ \ \ \ \ \ |