summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta'Rainer Gerhards2010-01-126-15/+43
|\
| * Merge branch 'v4-beta' into betaRainer Gerhards2010-01-123-7/+11
| |\
| | * Merge branch 'v4-beta-memleak' into v4-betaRainer Gerhards2010-01-122-0/+8
| | |\
| | | * fixed a memory leak when sending messages in zip-compressed formatNaoya Nakazawa2010-01-112-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | doc bugfix: "-h" option no longer existsRainer Gerhards2010-01-121-7/+3
| | |/
| * | bugfix: ompgsql did not properly check the server connection in tryResume()Rainer Gerhards2009-12-163-13/+18
| | | | | | | | | | | | | | | what could lead to rsyslog running in a thight loop. Also did some code cleanup of previous patch.
| * | bugfix: error during beginTransaction() was not properly handledRainer Gerhards2009-12-162-2/+21
| | | | | | | | | | | | | | | Suspension during beginTransaction() did not properly cause the action to be suspended, thus we entered an endless loop.
* | | doc bugfix: broken intra-doc linkRainer Gerhards2009-12-111-1/+1
| | |
* | | Merge branch 'beta'Rainer Gerhards2009-12-111-1/+2
|\| |
| * | made ompgsql behave correctly with older rsyslog core versionsRainer Gerhards2009-12-111-1/+2
| | |
* | | cosmetic: mentioned imported patch in ChangeLogRainer Gerhards2009-12-111-0/+3
| | |
* | | Merge branch 'beta'Rainer Gerhards2009-12-112-1/+10
|\| |
| * | bugfix: ompgsql had problems with transaction support, what actually ↵Rainer Gerhards2009-12-112-1/+6
| | | | | | | | | | | | | | | | | | | | | 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 platformsRainer Gerhards2009-12-094-0/+62
| | | | | | | | | | | | | | | | | | ...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 betaRainer Gerhards2009-12-042-0/+3
| |\|
* | | Merge branch 'v4-devel'Rainer Gerhards2009-12-042-0/+5
|\ \ \
| * \ \ Merge branch 'v4-beta' into v4-develRainer Gerhards2009-12-043-1/+10
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: ChangeLog
| | * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-12-042-0/+3
| | |\ \
| | | * \ Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-12-042-0/+3
| | | |\ \
| | | | * | bugfix: potential segfault when -p command line option was usedRainer Gerhards2009-12-042-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | thanks to varmojfekoj for pointing me at this bug
| * | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-302-1/+3
| |\ \ \ \ \
* | | | | | | worked around an issue where omfile failed to compile on32 bit platformsRainer Gerhards2009-12-024-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Gerhards2009-11-302-1/+7
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | Merge branch 'v4-beta' into betaRainer Gerhards2009-11-302-1/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | bugfix: hostname accidently set to IP address for some message sourcesRainer Gerhards2009-11-302-1/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | for example imudp. Thanks to Anton for reporting this bug.
| | * | | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-302-1/+3
| | |\ \ \ \ | | | | |/ / | | | |/| |
* | | | | | extended testbench: tests for $CreateDirsRainer Gerhards2009-11-307-2/+74
| | | | | |
* | | | | | Merge branch 'beta'Rainer Gerhards2009-11-302-1/+5
|\| | | | |
| * | | | | cosmetic: mentioned imported patch in ChangeLogRainer Gerhards2009-11-301-0/+2
| | | | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2009-11-302-1/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'v4-stable' into v5-stableRainer Gerhards2009-11-306-28/+51
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_modules.html
| | | * | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-302-1/+3
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | bugfix: $CreateDirs variable not properly initializedRainer Gerhards2009-11-302-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | default thus was random (but most often "on")
* | | | | | | bumped version number & updated project statusRainer Gerhards2009-11-273-5/+7
| | | | | | |
* | | | | | | preparing for 5.5.1 releasev5.5.1Rainer Gerhards2009-11-271-1/+1
| | | | | | |
* | | | | | | re-implemented $EscapeControlCharacterTab config directiveRainer Gerhards2009-11-279-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on Jonathan Bond-Caron's patch for v4. This now also includes some automatted tests.
* | | | | | | Merge branch 'v4-devel' into masterRainer Gerhards2009-11-272-2/+5
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 at least minimal doc for $EscapeControlCharacterTabRainer Gerhards2009-11-271-0/+1
| | | | | | |
| * | | | | | added $EscapeControlCharacterTab config directiveJonathan Bond-Caron2009-11-273-6/+11
| | | | | | |
| * | | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-252-1/+6
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'beta' into masterRainer Gerhards2009-11-264-8/+24
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Gerhards2009-11-262-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | potentially resulting in non-message destruction and thus hangs
| * | | | | | Merge branch 'v4-beta' into betaRainer Gerhards2009-11-257-30/+58
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | | enhanced module debug outputRainer Gerhards2009-11-252-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and addes some (later-to-be-removed) debug code to support finding a problem in transaction handling.
* | | | | | | doc: added info on compile settings for atomic ops when building from sourceRainer Gerhards2009-11-252-2/+28
| | | | | | |
* | | | | | | solved some platform issues with nsdpoll_ptcpRainer Gerhards2009-11-253-3/+9
| | | | | | |
* | | | | | | Merge branch 'beta'Rainer Gerhards2009-11-253-0/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2009-11-252-0/+21
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am
| | * | | | | bugfix: enabling GSSServer crashes rsyslog startupTomas Kubina2009-11-252-0/+6
| | | | | | |