Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-13 | 1 | -0/+4 | |
| |\| | | ||||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-13 | 1 | -0/+4 | |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | | * | add "EAGAIN" patch to ChangeLog | Rainer Gerhards | 2012-11-13 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-09 | 1 | -0/+21 | |
|\| | | | ||||||
| * | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-09 | 1 | -0/+10 | |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | |||||
| | * | | bugfix: $IncludeConfig did not correctly process directories | Rainer Gerhards | 2012-11-09 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=376 The testbench was also enhanced to check for these cases. Thanks to Georgi Georgiev for the bug report. Also minor bugfix: no error msg on unreadable $IncludeConfig path | |||||
| * | | | cleanup | Rainer Gerhards | 2012-11-09 | 1 | -7/+7 | |
| | | | | ||||||
| * | | | Merge branch 'v7.2.1-bugfix' into v7-stable | Rainer Gerhards | 2012-11-09 | 1 | -0/+7 | |
| |\ \ \ | ||||||
| | * | | | bugfix: potential segfault due to invalid param handling in comparisons | Rainer Gerhards | 2012-11-08 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen in RainerScript comparisons (like contains); in some cases an unitialized variable was accessed, which could lead to an invalid free and in turn to a segfault. Closes: http://bugzilla.adiscon.com/show_bug.cgi?id=372 Thanks to Georgi Georgiev for reporting this bug and his great help in solving it. | |||||
| * | | | | enabled to build without libuuid, at loss of uuid functionality | Rainer Gerhards | 2012-11-09 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this enables smoother builds on older systems that do not support libuuid. Loss of functionality should usually not matter too much as uuid support has only recently been added and is very seldom used. | |||||
* | | | | | doc: mention imported patches in ChangeLog | Rainer Gerhards | 2012-11-08 | 1 | -0/+6 | |
| | | | | | ||||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-08 | 1 | -0/+5 | |
|\| | | | | ||||||
| * | | | | doc: mention imported patch in ChangeLog | Rainer Gerhards | 2012-11-08 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-08 | 1 | -0/+1 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | bugfix: no error msg on invalid field option in legacy/string template | Rainer Gerhards | 2012-11-08 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | bugfixes in string-type template()S | Rainer Gerhards | 2012-11-08 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both are closely related and thus rolled into a single commit. - bugfix: improper handling of backslash in string-type template()s - bugfix: leading quote (") in string-type template() lead to thight loop on startup | |||||
* | | | | | prepare for 7.3.3 releasev7.3.3 | Rainer Gerhards | 2012-11-07 | 1 | -0/+3 | |
| | | | | | ||||||
* | | | | | bugfix: dynafile zip files could be corrupted | Rainer Gerhards | 2012-11-05 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen if a dynafile was destructed before the first write. In practice, this could happen if few lines were written to a file and it then became evicted from the dynafile cache. This would probably look very random, because it depended on the timing in regard to message volume and dynafile cache size. | |||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-02 | 1 | -0/+4 | |
|\| | | | | ||||||
| * | | | | bugfix: potential abort of imtcp on rsyslogd shutdown | Rainer Gerhards | 2012-11-02 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | bugfix: potential segfault when re_match() function was used | oxpa | 2012-11-02 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to oxpa for the patch. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=371 | |||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-01 | 1 | -0/+3 | |
|\| | | | | ||||||
| * | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 1 | -0/+3 | |
| |\| | | | ||||||
| | * | | | doc: add recent patch (API) to ChangeLog | Rainer Gerhards | 2012-11-01 | 1 | -0/+3 | |
| | | | | | ||||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-01 | 1 | -1/+10 | |
|\| | | | | ||||||
| * | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 1 | -0/+7 | |
| |\| | | | ||||||
| | * | | | bugfix: misaddressing of $mmnormalizeuserawmsg parameter | Rainer Gerhards | 2012-11-01 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On many platforms, this has no effect at all. At some, it may cause a segfault. The problem occurs only during config phase, no segfault happens when rsyslog has fully started. | |||||
| | * | | | bugfix: build problems on some platforms | Rainer Gerhards | 2012-10-26 | 1 | -0/+3 | |
| | | | | | ||||||
| * | | | | bugfix: imzmq3 segfault with PULL subscription | Martin Nilsson | 2012-10-30 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | mmnormalize: support for v6+ config interface added | Rainer Gerhards | 2012-11-01 | 1 | -0/+3 | |
| | | | | | ||||||
* | | | | | mmjsonparse: support for v6+ config interface added | Rainer Gerhards | 2012-11-01 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | prepare for 7.3.2 releasev7.3.2 | Rainer Gerhards | 2012-10-30 | 1 | -1/+9 | |
| | | | | | ||||||
* | | | | | Merge branch 'master-ratelimit' | Rainer Gerhards | 2012-10-30 | 1 | -0/+6 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-24 | 1 | -0/+8 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/v7compatibility.html | |||||
| * \ \ \ \ \ | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-23 | 1 | -4/+15 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 1 | -13/+38 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * \ \ \ \ \ \ \ | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-16 | 1 | -4/+20 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | | | | | | imtcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | imudp: support for Linux-like ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -1/+3 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | imptcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 1 | -1/+39 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html | |||||
| * | | | | | | | | | | imudp: add input batching & ratelimiter interface | Rainer Gerhards | 2012-10-15 | 1 | -0/+3 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-30 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | |||||
| * | | | | | | | | | | bugfix: omfwd did not properly support "template" parameter | Rainer Gerhards | 2012-10-30 | 1 | -0/+3 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also added a testbench test to check for this in the future. That in turn required new testbench tools. | |||||
| * | | | | | | | | | prepare for 7.2.1 releasev7.2.1 | Rainer Gerhards | 2012-10-29 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'beta-jsonrt' into master-es | Rainer Gerhards | 2012-10-29 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | |||||
| * | | | | | | | | | | omelasticsearch: support for writing data errors to local file added | Rainer Gerhards | 2012-07-30 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | bugfix: ruleset()-object did only support a single statement | Rainer Gerhards | 2012-10-27 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-27 | 1 | -0/+2 | |
|\| | | | | | | | | | | |_|_|_|_|_|_|/ / / |/| | | | | | | | | |