summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-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>
* | 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.
* | 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
|/ /
* | 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
* | | 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
|\| |
| * | 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 (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 'v4-stable' into v4-betaRainer Gerhards2009-11-123-4/+9
|\| |
| * | cosmetic: mention imported v3-bugfix in ChangeLogRainer Gerhards2009-11-121-0/+2
| | |
| * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-123-4/+7
| |\|
| | * bugfix: segfault on startup when -q or -Q option was givenRainer Gerhards2009-11-123-4/+7
| | | | | | | | | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=157 Thanks to Jonas Nogueira for reporting this bug.
* | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-126-1/+55
|\| | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | bugfix: $ActionExecOnlyOnceEveryInterval did not work.Rainer Gerhards2009-11-126-1/+52
| | | | | | | | | | | | | | | | | | This was a regression from the time() optimizations done in v4. Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=143 Thanks to Klaus Tachtler for reporting this bug.
* | | somewhat enhanced test suiteRainer Gerhards2009-11-1119-29/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also prepared test case for TLS testing, but not activated it inside the build itself. A note on TLS testing: the current testsuite (in git!) already contains TLS test cases. However, getting these test cases correct is not simple. That's not a problem with the code itself, but rater a problem with synchronization in the test environment. So I have deciced to keep the TLS tests in, but not yet actually utilize them. This is most probably left as an excercise for future (devel) releases.
* | | testbench improvement: gzip-plain-tcp mode is now being testedRainer Gerhards2009-11-117-21/+71
| | | | | | | | | | | | | | | ... also improved two-instance test mechanism, now have a generic approach.
* | | added support for dual-rsyslogd-instance test cases to testbenchRainer Gerhards2009-11-116-17/+98
| | | | | | | | | | | | ... plus a simple initial test of the tcp forwarding capability.
* | | doc: added reasoning for why use env vars to configure debug systemRainer Gerhards2009-11-101-2/+22
| | |
* | | added a so-called "On Demand Debug" modeRainer Gerhards2009-11-104-23/+132
| | | | | | | | | | | | | | | | | | in which debug output can be generated only after the process has started, but not right from the beginning. This is assumed to be useful for hard-to-find bugs. Also improved the doc on the debug system.
* | | bumped version numberRainer Gerhards2009-11-051-0/+2
| | |
* | | preparing for 4.5.6v4.5.6Rainer Gerhards2009-11-051-1/+1
| | |
* | | added pipe action test to testbench & testbench bugfixRainer Gerhards2009-11-0510-14/+74
| | |
* | | bugfix: named pipes did no longer work (they always got an open error)Rainer Gerhards2009-11-053-2/+10
| | | | | | | | | | | | this was a regression from the omfile rewrite in 4.5.0
* | | bugfix(testbench): testcase did not properly wait for rsyslod shutdownRainer Gerhards2009-10-302-1/+8
| | | | | | | | | | | | | | | thus some unpredictable behavior and a false negative test result could occur. [BACKPORTED from v5]
* | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-10-212-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imrelp/imrelp.c
| * | bumped version numberRainer Gerhards2009-10-203-4/+6
| | |
| * | added imported bugfix to changelogRainer Gerhards2009-10-201-0/+2
| | |
| * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-10-202-2/+1
| |\|
| | * bugfix: potential hang condition on queue shutdownRainer Gerhards2009-10-202-2/+1
| | |
| * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-10-143-5/+9
| |\| | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| * | preparing for 4.4.2 releasev4.4.2Rainer Gerhards2009-10-091-1/+1
| | |
* | | Merge branch 'aaron' into v4-betaRainer Gerhards2009-10-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog