Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2010-01-26 | 1 | -0/+20 | |
|\| | | | | | ||||||
| * | | | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-01-26 | 1 | -0/+20 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c | |||||
| | * | | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2010-01-26 | 1 | -0/+2 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c | |||||
| | | * | | | bugfix: potential segfault on queue shutdown | varmojfekoj | 2010-01-26 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | |||||
| | * | | | | Merge branch 'queuepatch' into v4-betanew | Rainer Gerhards | 2010-01-26 | 1 | -0/+3 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c | |||||
| | * | | | | bugfix: -d did not enable display of debug messages | Rainer Gerhards | 2010-01-19 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regression from introduction of "debug on demand" mode Thanks to Michael Biebl for reporting this bug | |||||
| | * | | | | bugfix: blanks inside file names did not terminate file name parsing. | Rainer Gerhards | 2010-01-19 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Gerhards | 2010-01-19 | 1 | -0/+6 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-01-15 | 1 | -0/+6 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | * | | | | bugfix: rsyslog hangs when writing to a named pipe which nobody was reading. | Rainer Gerhards | 2010-01-15 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for reporting this bug. | |||||
* | | | | | | 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 |