summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* preparing for 5.3.7v5.3.7Rainer Gerhards2010-01-273-6/+3
|
* backporting bugfixes from 5.2.2Rainer Gerhards2010-01-273-3/+11
| | | | | | | | | | | - 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]
* Merge branch 'v4-beta' into betaRainer Gerhards2010-01-263-1/+23
|\ | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| * Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-01-261-0/+2
| |\ | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * bugfix: potential segfault on queue shutdownvarmojfekoj2010-01-262-9/+16
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | 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-262-10/+18
| |\ \ | | | | | | | | | | | | | | | | 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: -d did not enable display of debug messagesRainer Gerhards2010-01-192-0/+4
| | | | | | | | | | | | | | | 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 Gerhards2010-01-192-1/+6
| | | | | | | | | | | | | | | | | | 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 'v4-beta' into betaRainer Gerhards2010-01-192-4/+4
|\| |
| * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-01-192-4/+4
| |\|
| | * Fix a typo regarding syslog.h and syslog(3)Michael Biebl2010-01-192-4/+4
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-154-10/+34
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | bugfix: rsyslog hangs when writing to a named pipe which nobody was reading.Rainer Gerhards2010-01-154-11/+33
| | | | | | | | | | | | Thanks to Michael Biebl for reporting this bug.
* | | prepared for 5.3.6v5.3.6Rainer Gerhards2010-01-133-5/+5
| | |
* | | 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.
* | | made ompgsql behave correctly with older rsyslog core versionsRainer Gerhards2009-12-111-1/+2
| | |
* | | 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-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 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
| |\| |
* | | | 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")
* | | | | 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>
| * | | | preparing for 4.5.7v4.5.7Rainer Gerhards2009-11-185-3/+5
| | | | |
| * | | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-174-26/+48
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-174-26/+48
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf.html runtime/net.c
| | | * | minor doc: enhanced description of loadable modulesRainer Gerhards2009-11-171-17/+36
| | | | |
| | | * | correcting -q/-Q patch - was invalidRainer Gerhards2009-11-123-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | This is the correct patch. The previous one solved the segfault, but disabled the -q/Q options.
* | | | | 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
| | | | |
| * | | | cosmetic: added bugfix to changelogRainer Gerhards2009-11-121-0/+2
| | | | |
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2009-11-123-4/+9
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2009-11-126-1/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am