Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 1 | -13/+38 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | prepare for 7.3.1 releasev7.3.1 | Rainer Gerhards | 2012-10-19 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 1 | -2/+5 |
| |\ | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -2/+3 |
| | | | | | | | | | | | | plus some cleanup | ||||
| | * | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 1 | -0/+1 |
| | |\ | |||||
| | | * | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-18 | 1 | -1/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | preparing for 7.1.12 releasev7.1.12 | Rainer Gerhards | 2012-10-18 | 1 | -1/+3 |
| | | | | |||||
| * | | | doc: add recent optimization to ChangeLog | Rainer Gerhards | 2012-10-18 | 1 | -0/+2 |
| | | | | |||||
| * | | | doc: update ChangeLog info | Rainer Gerhards | 2012-10-17 | 1 | -1/+5 |
| | | | | |||||
| * | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-17 | 1 | -3/+6 |
| |\| | | |||||
| | * | | doc: add (v5-imported) imklog bugfix to ChangeLog | Rainer Gerhards | 2012-10-17 | 1 | -0/+3 |
| | | | | |||||
| | * | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-17 | 1 | -3/+3 |
| | |\| | |||||
| | | * | doc: reflect recent (v5-imported) fix in ChangeLog | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-17 | 1 | -2/+2 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | | * | preparing for 5.10.1v5.10.1 | Rainer Gerhards | 2012-10-17 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-16 | 1 | -5/+29 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 1 | -0/+8 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: rsyslog.service.in | ||||
| | | * | | cleanup: removed remains of -c option (compatibility mode) | Rainer Gerhards | 2012-10-16 | 1 | -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 ChangeLog | Rainer Gerhards | 2012-10-16 | 1 | -3/+7 |
| | | | | | |||||
* | | | | | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-16 | 1 | -4/+20 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | prepare for version 7.1.11v7.1.11 | Rainer Gerhards | 2012-10-16 | 1 | -2/+6 |
| | | | | | |||||
| * | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 1 | -1/+9 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-16 | 1 | -0/+8 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| | | * | | bugfix: imuxsock truncated head of received message | Rainer Gerhards | 2012-10-16 | 1 | -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 ChangeLog | Rainer Gerhards | 2012-10-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | 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 | ||||
| * | | | | doc: update ChangeLog with CEE cookie change | Rainer Gerhards | 2012-10-11 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | this is important for interop, so make sure each affected version correctly lists it. | ||||
| * | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -0/+14 |
| |\| | | | |||||
| | * | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-11 | 1 | -0/+12 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/mmjsonparse/mmjsonparse.c | ||||
| | | * | | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 1 | -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 ChangeLog | Rainer Gerhards | 2012-10-11 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -0/+7 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | added deprecated note to omruleset | Rainer Gerhards | 2012-10-11 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | bugfixes in regards to action() | Rainer Gerhards | 2012-10-11 | 1 | -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 errors | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -0/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | mention recent changes in ChangeLog | Rainer Gerhards | 2012-10-11 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-10 | 1 | -1/+7 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | prepare for 7.1.9 releasev7.1.9 | 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. | ||||
* | | | | | imudp: add input batching & ratelimiter interface | Rainer Gerhards | 2012-10-15 | 1 | -0/+3 |
|/ / / / | |||||
* | | | | preparing for 7.3.0 releasev7.3.0 | 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 |
|\ \ \ \ \ | | |/ / / | |/| | | |