Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Rainer Gerhards | 2010-01-13 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | prepared for 5.3.6v5.3.6 | Rainer Gerhards | 2010-01-13 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'beta' | Rainer Gerhards | 2010-01-12 | 1 | -0/+6 |
|\| | |||||
| * | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-01-12 | 1 | -0/+2 |
| |\ | |||||
| | * | fixed a memory leak when sending messages in zip-compressed format | Naoya Nakazawa | 2010-01-11 | 1 | -0/+2 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | bugfix: ompgsql did not properly check the server connection in tryResume() | Rainer Gerhards | 2009-12-16 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | what could lead to rsyslog running in a thight loop. Also did some code cleanup of previous patch. | ||||
* | | | cosmetic: mentioned imported patch in ChangeLog | Rainer Gerhards | 2009-12-11 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2009-12-11 | 1 | -0/+7 |
|\| | | |||||
| * | | bugfix: ompgsql had problems with transaction support, what actually ↵ | Rainer Gerhards | 2009-12-11 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | rendered it unsuable. Thanks to forum user "horhe" for alerting me on this bug and helping to debug/fix it! | ||||
| * | | 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/+2 |
| |\| | |||||
* | | | Merge branch 'v4-devel' | Rainer Gerhards | 2009-12-04 | 1 | -0/+4 |
|\ \ \ | |||||
| * \ \ | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-12-04 | 1 | -0/+8 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-12-04 | 1 | -0/+2 |
| | |\ \ | |||||
| | | * \ | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-12-04 | 1 | -0/+2 |
| | | |\ \ | |||||
| | | | * | | bugfix: potential segfault when -p command line option was used | Rainer Gerhards | 2009-12-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | thanks to varmojfekoj for pointing me at this bug | ||||
| * | | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-30 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
* | | | | | | | worked around an issue where omfile failed to compile on32 bit platforms | Rainer Gerhards | 2009-12-02 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+6 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2009-11-30 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | bugfix: hostname accidently set to IP address for some message sources | Rainer Gerhards | 2009-11-30 | 1 | -0/+2 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | for example imudp. Thanks to Anton for reporting this bug. | ||||
| | * | | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-11-30 | 1 | -0/+2 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
* | | | | | | extended testbench: tests for $CreateDirs | Rainer Gerhards | 2009-11-30 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2009-11-30 | 1 | -0/+4 |
|\| | | | | | |||||
| * | | | | | cosmetic: mentioned imported patch in ChangeLog | Rainer Gerhards | 2009-11-30 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2009-11-30 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2009-11-30 | 1 | -0/+2 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_modules.html | ||||
| | | * | | | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-11-30 | 1 | -0/+2 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | bugfix: $CreateDirs variable not properly initialized | Rainer Gerhards | 2009-11-30 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | default thus was random (but most often "on") | ||||
* | | | | | | | bumped version number & updated project status | Rainer Gerhards | 2009-11-27 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | preparing for 5.5.1 releasev5.5.1 | Rainer Gerhards | 2009-11-27 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | re-implemented $EscapeControlCharacterTab config directive | Rainer Gerhards | 2009-11-27 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on Jonathan Bond-Caron's patch for v4. This now also includes some automatted tests. | ||||
* | | | | | | | Merge branch 'v4-devel' into master | Rainer Gerhards | 2009-11-27 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I needed to (temporarily) remove the $EscapeControlCharacterTab config directive as it no longer fits into the rewritten rsyslog parser part. Conflicts: dirty.h tools/syslogd.c | ||||
| * | | | | | | added $EscapeControlCharacterTab config directive | Jonathan Bond-Caron | 2009-11-27 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-25 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merge branch 'beta' into master | Rainer Gerhards | 2009-11-26 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html doc/rsyslog_conf_modules.html tests/sndrcv_drvr.sh | ||||
| * | | | | | | bugfix: commit transaction was not properly conveyed to message layer, | Rainer Gerhards | 2009-11-26 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | potentially resulting in non-message destruction and thus hangs | ||||
| * | | | | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2009-11-25 | 1 | -1/+5 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 TLS | Jonathan Bond-Caron | 2009-11-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2009-11-25 | 1 | -0/+25 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2009-11-25 | 1 | -0/+19 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am | ||||
| | * | | | | | bugfix: enabling GSSServer crashes rsyslog startup | Tomas Kubina | 2009-11-25 | 1 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | cosmetic: added bugfix to changelog | Rainer Gerhards | 2009-11-12 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2009-11-12 | 1 | -0/+5 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2009-11-12 | 1 | -0/+8 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | * | | | | | | preparing for version 5.2.0v5.2.0 | Rainer Gerhards | 2009-11-02 | 1 | -0/+7 |
| | | | | | | | | |||||
| * | | | | | | | bugfix: omfile output was only written when buffer was full | Rainer Gerhards | 2009-11-18 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... not at end of transaction. | ||||
* | | | | | | | | Merge branch 'nspoll' | Rainer Gerhards | 2009-11-25 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | goal reached: epoll() driver for plain tcp syslog receiver available | Rainer Gerhards | 2009-11-25 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduced the ablity for netstream drivers to utilize an epoll interface This offers increased performance and removes the select() FDSET size limit from imtcp. Note that we fall back to select() if there is no epoll netstream drivers. So far, an epoll driver has only been implemented for plain tcp syslog, the rest will follow once the code proves well in practice AND there is demand. | ||||
* | | | | | | | | | Merge branch 'v4-devel' into tmp | Rainer Gerhards | 2009-11-20 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tests/sndrcv_drvr.sh tools/syslogd.c |