Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Rainer Gerhards | 2012-10-10 | 1 | -1/+7 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | prepare for 7.1.9 release | Rainer Gerhards | 2012-10-09 | 1 | -2/+2 |
| | | |||||
| * | bugfix: in (non)equal comparisons the position of arrays influenced result | Rainer Gerhards | 2012-10-09 | 1 | -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. | ||||
* | | preparing for 7.3.0 release | Rainer Gerhards | 2012-10-08 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'c1-streamzip' into master-streamzip | Rainer Gerhards | 2012-10-05 | 1 | -0/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c | ||||
| * | | improved omfile zip writer to increase compression | Rainer Gerhards | 2012-09-14 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new setting $OMFileVeryReliableZip. | ||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am | ||||
| | * \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * | | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 1 | -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. | ||||
* | | | | | omlibdbi improvements | Rainer Gerhards | 2012-10-04 | 1 | -0/+8 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 tarball | Rainer Gerhards | 2012-10-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem. | ||||
* | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
|\| | | | |||||
| * | | | bugfix: comments inside objects (e.g. action()) were not properly handled | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| | | | | |||||
* | | | | prepare for 7.1.8 release | Rainer Gerhards | 2012-10-02 | 1 | -4/+4 |
| | | | | |||||
* | | | | add "parser" parameter to ruleset(), so that parser chain can be configured | Rainer Gerhards | 2012-10-02 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 1 | -0/+2 |
|\| | | | | |||||
| * | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-02 | 1 | -0/+2 |
| |\| | | | |||||
| | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 1 | -0/+2 |
| | |\| | | |||||
| | | * | | bugfix: fixed wrong bufferlength for snprintf in tcpflood.c | Andre Lorbach | 2012-09-28 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail. | ||||
* | | | | | minor: mention better doc in ChangeLog | Rainer Gerhards | 2012-10-02 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | implement "continue" RainerScript statement | Rainer Gerhards | 2012-10-01 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | bugfix: ruleset(){} directive errornously changed default ruleset | Rainer Gerhards | 2012-10-01 | 1 | -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 release | Rainer Gerhards | 2012-10-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | implement RainerScript "call" statement | Rainer Gerhards | 2012-10-01 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | implement imtcp "permittedPeers" module-global parameter | Rainer Gerhards | 2012-10-01 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-28 | 1 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | preparing for 7.1.6 release | Rainer Gerhards | 2012-09-28 | 1 | -1/+5 |
| | | | | | | |||||
* | | | | | | implement RainerScript array-based string comparison operations | Rainer Gerhards | 2012-09-28 | 1 | -0/+3 |
|/ / / / / | |||||
* | | | | | Implement RainerScript ruleset() statement | Rainer Gerhards | 2012-09-28 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | fix screwed-up ChangeLog | Rainer Gerhards | 2012-09-28 | 1 | -12/+8 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 1 | -0/+14 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | | | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
| * | | | | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge branch 'v6-stable' into v6-devel-input | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
| |\| | | | |||||
* | | | | | preparing for 7.1.5 | Rainer Gerhards | 2012-09-26 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c | ||||
| | | * | | enable DNS resolution in imrelp | Apollon Oikonomopoulos | 2012-09-26 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-21 | 1 | -0/+4 |
| |\| | | | |||||
* | | | | | doc: add recent changes to ChangeLog | Rainer Gerhards | 2012-09-24 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge branch 'v6-stable' into master-newruleset | Rainer Gerhards | 2012-09-21 | 1 | -0/+4 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: grammar/lexer.l | ||||
| * | | | | bugfix: some valid legacy PRI filters were flagged as errornous | Rainer Gerhards | 2012-09-21 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358 This happend to filters of the style "local0,local1.*", where the multiple facilities were comma-separated. | ||||
* | | | | | Implement RainerScript prifield() function | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Implement RainerScript field() function | Rainer Gerhards | 2012-09-20 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog |