summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* doc: add (v5-imported) imklog bugfix to ChangeLogRainer Gerhards2012-10-171-0/+3
|
* Merge branch 'v6-stable' into betaRainer Gerhards2012-10-171-3/+3
|\
| * doc: reflect recent (v5-imported) fix in ChangeLogRainer Gerhards2012-10-171-1/+1
| |
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-171-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * preparing for 5.10.1Rainer Gerhards2012-10-171-2/+2
| | |
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-161-0/+8
|\| | | | | | | | | | | | | | Conflicts: rsyslog.service.in
| * | cleanup: removed remains of -c option (compatibility mode)Rainer Gerhards2012-10-161-0/+4
| | | | | | | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions
* | | doc: mention recent patches in ChangeLogRainer Gerhards2012-10-161-3/+7
| | |
* | | prepare for version 7.1.11Rainer Gerhards2012-10-161-2/+6
| | |
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-161-1/+9
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-161-0/+8
| |\| | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | * bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. Note that Milan sent a patch, which solved the problem under some conditions (can be found somewhat earlier in git history). However, it did not handle the original root cause, and so did not fix the problem always. The main reason was that the date parser modifies the provided lenghts. That part of the API was not properly used by the caller (who decremented the length once more).
| * | doc: fix minor small but important typo in ChangeLogRainer Gerhards2012-10-161-1/+1
| | |
* | | 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-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | doc: add last patch to ChangeLogRainer Gerhards2012-10-111-0/+2
| | |
* | | add deprecated note to discard actionRainer Gerhards2012-10-111-0/+1
| | |
* | | added deprecated note to omrulesetRainer Gerhards2012-10-111-0/+3
| | |
* | | bugfixes in regards to action()Rainer Gerhards2012-10-111-0/+2
| | | | | | | | | | | | | | | - 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-111-0/+1
| | |
* | | mention recent changes in ChangeLogRainer Gerhards2012-10-111-1/+6
| | |
* | | prepare for 7.1.9 releaseRainer Gerhards2012-10-091-2/+2
| | |
* | | bugfix: in (non)equal comparisons the position of arrays influenced resultRainer Gerhards2012-10-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-0/+1
|\| | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-041-0/+1
| |\|
| | * remove cust1 dummy plugin from build systemRainer Gerhards2012-10-041-0/+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.
* | | doc: add missing files to distribution tarballRainer Gerhards2012-10-041-0/+3
| | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-0/+1
|\| |
| * | bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-041-0/+1
| | |
* | | prepare for 7.1.8 releaseRainer Gerhards2012-10-021-4/+4
| | |
* | | add "parser" parameter to ruleset(), so that parser chain can be configuredRainer Gerhards2012-10-021-0/+2
| | |
* | | Merge branch 'v6-devel'Rainer Gerhards2012-10-021-0/+1
|\ \ \
| * | | integrate logctl into build processRainer Gerhards2012-10-021-0/+1
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-021-0/+2
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-021-0/+2
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-021-0/+2
| | |\|
| | | * bugfix: fixed wrong bufferlength for snprintf in tcpflood.cAndre Lorbach2012-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail.
* | | | minor: mention better doc in ChangeLogRainer Gerhards2012-10-021-0/+1
| | | |
* | | | implement "continue" RainerScript statementRainer Gerhards2012-10-011-0/+1
| | | |
* | | | bugfix: ruleset(){} directive errornously changed default rulesetRainer Gerhards2012-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset.
* | | | preparing for 7.1.7 releaseRainer Gerhards2012-10-011-1/+1
| | | |
* | | | implement RainerScript "call" statementRainer Gerhards2012-10-011-0/+1
| | | |
* | | | implement imtcp "permittedPeers" module-global parameterRainer Gerhards2012-10-011-0/+2
| | | |
* | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-281-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | preparing for 7.1.6 releaseRainer Gerhards2012-09-281-1/+5
| | | | |
* | | | | implement RainerScript array-based string comparison operationsRainer Gerhards2012-09-281-0/+3
|/ / / /
* | | | Implement RainerScript ruleset() statementRainer Gerhards2012-09-281-0/+1
| | | |
* | | | fix screwed-up ChangeLogRainer Gerhards2012-09-281-12/+8
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-271-0/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-0/+2
| | | | | | | | | | | | | | | | This could lead to startup with invalid parameters.