Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 2 | -1/+8 |
|\ | |||||
| * | bugfix: misaddressing of $mmnormalizeuserawmsg parameter | Rainer Gerhards | 2012-11-01 | 2 | -1/+5 |
| | | | | | | | | | | | | 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 | 2 | -1/+4 |
| | | |||||
* | | bugfix: imzmq3 segfault with PULL subscription | Martin Nilsson | 2012-10-30 | 2 | -3/+7 |
| | | |||||
* | | bugfix: omfwd did not properly support "template" parameter | Rainer Gerhards | 2012-10-30 | 7 | -3/+110 |
| | | | | | | | | | | We also added a testbench test to check for this in the future. That in turn required new testbench tools. | ||||
* | | testbench: complex1.sh testcase failed on slower machines | Rainer Gerhards | 2012-10-29 | 2 | -0/+6 |
| | | | | | | | | ... due to too small timeout for enqueue processing --> messages got lost | ||||
* | | prepare for 7.2.1 releasev7.2.1 | Rainer Gerhards | 2012-10-29 | 3 | -3/+3 |
| | | |||||
* | | testbench: add test for ruleset() and call statements | Rainer Gerhards | 2012-10-29 | 3 | -0/+38 |
| | | |||||
* | | bugfix: ruleset()-object did only support a single statement | Rainer Gerhards | 2012-10-27 | 2 | -1/+2 |
| | | |||||
* | | add -D rsyslogd option to enable config parser debug mode | Rainer Gerhards | 2012-10-27 | 3 | -1/+14 |
| | | |||||
* | | Improve syntax error messages by outputting the error token | Rainer Gerhards | 2012-10-27 | 2 | -1/+3 |
| | | |||||
* | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-25 | 1 | -2/+1 |
|\| | |||||
| * | doc: fix html formatting | Michael Biebl | 2012-10-25 | 1 | -2/+1 |
| | | |||||
* | | cleanup | Rainer Gerhards | 2012-10-24 | 2 | -3/+1 |
| | | |||||
* | | make rsyslog core suspened actions after 10 failures in a row | Rainer Gerhards | 2012-10-24 | 3 | -1/+15 |
| | | | | | | | | | | This was former the case after 1,000 failures and could cause rsyslog to be spammed/ressou | ||||
* | | ommongodb rate-limits error messages to prevent spamming the syslog | Rainer Gerhards | 2012-10-24 | 2 | -13/+22 |
| | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366 | ||||
* | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-22 | 2 | -5/+11 |
|\| | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c | ||||
| * | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 5 | -7/+10 |
| | | |||||
| * | Merge branch 'v6-beta' into v6-stable | Rainer Gerhards | 2012-10-22 | 88 | -935/+7279 |
| |\ | |||||
| | * | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| | |\ | |||||
| | * | | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -0/+3 |
| | | | | |||||
| | * | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -5/+1 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 6 | -45/+22 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 2 | -9/+11 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | preparing for 6.5.1 releasev6.5.1 | Rainer Gerhards | 2012-10-11 | 3 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | remove some assert()'s - valgrind does a better job... | Rainer Gerhards | 2012-10-11 | 1 | -4/+0 |
| | | | | | | | | |||||
| | * | | | | | | fix small memory leak with string-type templates | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | re-enabled commented-out serialization support in debug handler | Rainer Gerhards | 2012-10-11 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 5 | -29/+2 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 4 | -0/+32 |
| | |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 5 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized. | ||||
* | | | | | | | | | | testbench: -c option no longer exists | Rainer Gerhards | 2012-10-22 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | disable deprecated warnings in omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem. | ||||
* | | | | | | | | | | doc: remove BSD blocks from rsyslog.conf manpage | Rainer Gerhards | 2012-10-22 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364 | ||||
* | | | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'v5-stable' into v6-stablev6.4.3.unfinished | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | doc: v3 compatibility doc lists invalid config directive | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365 | ||||
* | | | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c | ||||
| | * | | | | | | | fix epoll-enabled code to use correct data member for pointers | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | 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 | 2 | -5/+1 |
|\| | | | | | | | | |||||
| * | | | | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 2 | -5/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | preparing for 7.1.12 releasev7.1.12 | Rainer Gerhards | 2012-10-18 | 3 | -3/+5 |
| | | | | | | | | |||||
* | | | | | | | | build: Remove vestiges of the cust1 plugin | Michael Biebl | 2012-10-18 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | build: Drop unused include path | Michael Biebl | 2012-10-18 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | build: Drop unused CNF_LIBS variable | Michael Biebl | 2012-10-18 | 2 | -3/+2 |
| | | | | | | | | |||||
* | | | | | | | | build: Use pkg-config to check for libcurl | Michael Biebl | 2012-10-18 | 1 | -19/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | curl has shipped that file since 2004. |