summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | preparing for version 5.2.0v5.2.0Rainer Gerhards2009-11-024-2/+51
| | | | | |
* | | | | | bugfix: omfile output was only written when buffer was fullRainer Gerhards2009-11-182-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | ... not at end of transaction.
* | | | | | solved some minor nits in make distcheckv5.3.5Rainer Gerhards2009-11-133-1/+3
| | | | | |
* | | | | | preparing for new beta (5.3.5)Rainer Gerhards2009-11-132-2/+2
| | | | | |
* | | | | | Begin new beta branchRainer Gerhards2009-11-13214-2656/+6278
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into beta Conflicts: ChangeLog tests/Makefile.am
| * | | | | some light performance enhancementRainer Gerhards2009-11-1213-20/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...by replacing time() call with much faster (at least under linux) gettimeofday() calls.
| * | | | | Merge branch 'v4-devel'Rainer Gerhards2009-11-122-11/+64
| |\ \ \ \ \
| | * \ \ \ \ 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.
| * | | | | | | cosmetic: mentioned imported bugfix in changelogRainer Gerhards2009-11-121-0/+2
| | | | | | | |
| * | | | | | | Merge branch 'v4-devel'Rainer Gerhards2009-11-123-4/+9
| |\| | | | | |
| | * | | | | | 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-devel'Rainer Gerhards2009-11-126-2/+58
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | | | 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.
| * | | | | some module cleanupRainer Gerhards2009-11-123-4/+14
| | | | | |
| * | | | | bugfix: omudpspoof miscalculated source and destination portsRainer Gerhards2009-11-122-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while this was probably not noticed for source ports, it resulted in almost all destination ports being wrong, except for the default port of 514, which by virtue of its binary representation was calculated correct (and probably thus the bug not earlier detected).
| * | | | | improved testbench: added tests for UDP forwarding and omudpspoofRainer Gerhards2009-11-1215-0/+158
| | | | | |
| * | | | | doc bugfix: omudpspoof had wrong config command names ("om" missing)Rainer Gerhards2009-11-122-5/+6
| | | | | |
| * | | | | cosmetic: added testbench improvement to ChangeLogRainer Gerhards2009-11-121-1/+2
| | | | | |
| * | | | | Merge branch 'v4-devel'Rainer Gerhards2009-11-1120-17/+306
| |\| | | |