summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: update ChangeLog with CEE cookie changeRainer Gerhards2012-10-111-0/+8
| | | | | this is important for interop, so make sure each affected version correctly lists it.
* Merge branch 'beta'Rainer Gerhards2012-10-113-3/+26
|\
| * Merge branch 'v6-stable' into betaRainer Gerhards2012-10-111-0/+12
| |\ | | | | | | | | | | | | Conflicts: plugins/mmjsonparse/mmjsonparse.c
| | * change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-112-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
| * | Don't require the trailing space in @cee: cookieMiloslav Trmač2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | The only mention of @cee: in the Lumberjack pages, https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space, and libumberlog does not in fact generate one.
| * | doc: add last patch to ChangeLogRainer Gerhards2012-10-111-0/+2
| | |
| * | Fix crash when date properties are used without a templateMiloslav Trmač2012-10-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Merge branch 'beta'Rainer Gerhards2012-10-119-8/+49
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | add deprecated note to discard actionRainer Gerhards2012-10-113-1/+25
| | |
| * | added deprecated note to omrulesetRainer Gerhards2012-10-113-0/+10
| | |
| * | make omruleset non-default in ./configureRainer Gerhards2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | as this module's functionality has been superseeded by the "call" statement. Thanks to Michael Biebl for alerting me on the still-old default.
| * | preparing for 7.1.10 releasev7.1.10Rainer Gerhards2012-10-112-2/+2
| | |
| * | fix regression introduced by last commitRainer Gerhards2012-10-111-1/+1
| | | | | | | | | | | | action object was created twice, resulting in memleak
| * | bugfixes in regards to action()Rainer Gerhards2012-10-112-0/+4
| | | | | | | | | | | | | | | - bugfix: small memory leak when processing action() statements - bugfix: unknown action() parameters were not reported
| * | bugfix: some config processing warning messages were treated as errorsRainer Gerhards2012-10-112-2/+7
| | |
| * | cosmetic: simplifyRainer Gerhards2012-10-111-3/+1
| | |
| * | fix double-freeRainer Gerhards2012-10-111-1/+1
| | |
* | | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+1
|\| |
| * | add missing prototypeRainer Gerhards2012-10-111-0/+1
| | |
| * | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | |
* | | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+5
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | mention recent changes in ChangeLogRainer Gerhards2012-10-111-1/+6
| | |
| * | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | |
| * | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | |
* | | Merge branch 'v6-devel'Rainer Gerhards2012-10-113-7/+5
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: template.c
| * | | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | | |
| * | | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | | |
| * | | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | | |
| * | | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| | | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-045-29/+2
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
| |\ \ \
* | \ \ \ Merge branch 'beta'Rainer Gerhards2012-10-103-5/+24
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | cosmetic cleanupRainer Gerhards2012-10-091-3/+1
| | | | |
| * | | | prepare for 7.1.9 releasev7.1.9Rainer Gerhards2012-10-093-4/+4
| | | | |
| * | | | bugfix: in (non)equal comparisons the position of arrays influenced resultRainer Gerhards2012-10-092-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behaviour is OK for "contains"-type of comparisons (which have quite different semantics), but not for == and <>, which shall be commutative. This has been fixed now, so there is no difference any longer if the constant string array is the left or right hand operand. We solved this via the optimizer, as it keeps the actual script execution code small.
* | | | | preparing for 7.3.0 releasev7.3.0Rainer Gerhards2012-10-083-3/+3
| | | | |
* | | | | fix compile problem with DEBUG instrumentation enabledRainer Gerhards2012-10-081-1/+0
| | | | |
* | | | | Merge branch 'c1-streamzip' into master-streamzipRainer Gerhards2012-10-055-51/+125
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c
| * | | | | improved omfile zip writer to increase compressionRainer Gerhards2012-09-146-51/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new setting $OMFileVeryReliableZip.
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-046-28/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | re-delete cust1.c plugin dummy fileRainer Gerhards2012-10-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is no longer needed.
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-045-28/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-044-27/+1
| | |\ \ \ \
| | | * | | | remove cust1 dummy plugin from build systemRainer Gerhards2012-10-044-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created.
| | * | | | | build: don't include librsyslog.la in the dist tarballMichael Biebl2012-10-041-2/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | libtool archives are not meant to be shipped in the source tarball.
* | / | | | omlibdbi improvementsRainer Gerhards2012-10-043-44/+161
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * support for config load phases & module() parameters * support for default templates * driverdirectory is now cleanly a global parameter, but can no longer be specified as an action paramter. Note that in previous versions this parameter was ignored in all but the first action definition NOTE: more solid testing is needed for these changes. We spare this, as the module is scheduled for more work. This commit is more or less staging work.
* | | | | doc: add missing files to distribution tarballRainer Gerhards2012-10-042-0/+6
| | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
* | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-044-0/+32
|\| | | |
| * | | | doc: add missing files to distribution tarballRainer Gerhards2012-10-041-0/+15
| | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
| * | | | bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-042-0/+2
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 22:55:17 +0000