summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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-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
| * | | 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-beta' into v4-develRainer Gerhards2009-11-302-1/+3
|\| | |
| * | | 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")
* | | | 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
|\| | |
| * | | 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>
* | | | debugondemand mode caused backgrounding to failRainer Gerhards2009-11-204-10/+17
| | | | | | | | | | | | | | | | | | | | This is close to a bug, but I'd consider the ability to background in this mode a new feature...
* | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-203-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | preparing for 4.5.7v4.5.7Rainer Gerhards2009-11-185-3/+5
| | | |
* | | | worked a bit on "unlimited select()" patchRainer Gerhards2009-11-173-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | - potential segfault in gss-misc.c - glbl interface needed different version ID - some compile time warning cleanup
* | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-174-26/+48
|\| | |
| * | | 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.
* | | | integrating varmojfekoj's "unlimited select()" patch into v4-develRainer Gerhards2009-11-1713-32/+187
|\ \ \ \
| * | | | added option to use unlimited-size select() callsvarmojfekoj2009-11-1712-31/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to varmjofekoj for the patch Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | Merge branch 'oracle' into v4-develRainer Gerhards2009-11-122-11/+64
|\ \ \ \ \
| * | | | | Give even better outputLuis Fernando Munoz Mejias2009-11-121-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell which statement is failing, which element in the batch, and give its details.
| * | | | | Improve the debug messagesLuis Fernando Munoz Mejias2009-11-121-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Improve traceability while testing.
| * | | | | Debug output to find out a crashLuis Fernando Munoz Mejias2009-11-121-1/+5
| | | | | |
| * | | | | Report errors when OCI_SUCCESS_WITH_INFO happensLuis Fernando Munoz Mejias2009-11-121-1/+29
| | | | | |
| * | | | | Improve the handling of OCI_SUCCESS_WITH_INFO.Luis Fernando Munoz Mejias2009-11-121-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop considering it as an error, and make it display the information from the Oracle server.
| * | | | | docLuis Fernando Munoz Mejias2009-11-122-8/+9
| | | | | |
| * | | | | If the server disconnects the handle is no longer valid and we need toLuis Fernando Munoz Mejias2009-11-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call tryResume(), so we have to return RS_RET_SUSPENDED. Otherwise, we may keep losing messages until rsyslog is restarted.
* | | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-123-4/+9
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | 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-beta' into v4-develRainer Gerhards2009-11-126-1/+55
|\| | | |
| * | | | 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.
* | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-1120-17/+306
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | | | 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.
* | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-104-26/+156
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | 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.