Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 1 | -2/+2 |
|\ | |||||
| * | minor: disable debug support in complex1.sh test | Rainer Gerhards | 2012-10-02 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 2 | -3/+3 |
|\| | |||||
| * | cleanup | Rainer Gerhards | 2012-10-02 | 1 | -1/+1 |
| | | |||||
| * | bugfix: fixed wrong bufferlength for snprintf in tcpflood.c | Andre Lorbach | 2012-09-28 | 2 | -3/+3 |
| | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail. | ||||
* | | testbench: do not run tests requiring root privs if non-root | Rainer Gerhards | 2012-09-20 | 2 | -0/+8 |
| | | |||||
* | | Fix new testbench test | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 |
| | | |||||
* | | Add test for script-based contains filter to testbench | Rainer Gerhards | 2012-09-14 | 3 | -0/+20 |
| | | |||||
* | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c | ||||
| * | preparing for 5.10.0 release | Rainer Gerhards | 2012-08-22 | 1 | -1/+3 |
| | | |||||
* | | Skip tests that require root if euid != 0 | Miloslav Trmač | 2012-05-31 | 4 | -0/+12 |
| | | | | | | | | | | | | This will mark them as SKIPPED instead of FAILED, making it at least in theory possible to get 0 FAILED tests even when running as an unprivileged user. | ||||
* | | Don't run valgrind tests if imdiag is not enabled | Miloslav Trmač | 2012-05-31 | 1 | -2/+2 |
| | | | | | | | | Valgrind tests depend on imdiag as well. | ||||
* | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-05-10 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-10 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | bugfix/tcpflood: sending small test files did not work correctly | Rainer Gerhards | 2012-05-10 | 1 | -2/+2 |
| | | | |||||
* | | | bugfix: abort during startup when rsyslog.conf v6+ format was used in a ↵ | Rainer Gerhards | 2012-02-02 | 3 | -4/+7 |
| | | | | | | | | | | | | certain way | ||||
* | | | ommysql: added support for v6 config format | Rainer Gerhards | 2012-02-02 | 2 | -0/+20 |
| | | | |||||
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-10-21 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | removed dependency on gcrypt for recently-enough GnuTLS | Rainer Gerhards | 2011-10-17 | 1 | -1/+5 |
| | | | | | | | | | | | | see: http://bugzilla.adiscon.com/show_bug.cgi?id=289 | ||||
| * | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-17 | 1 | -2/+3 |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-17 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-13 | 1 | -2/+3 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | fixed compiler warnings in tcpflood.c | Rainer Gerhards | 2011-10-06 | 1 | -2/+3 |
| | | | | |||||
* | | | | Merge branch 'beta'v6.3.5 | Rainer Gerhards | 2011-08-31 | 1 | -15/+14 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html tests/Makefile.am | ||||
| * | | | preparing for 6.1.12 releasev6.1.12 | Rainer Gerhards | 2011-08-31 | 1 | -14/+14 |
| | | | | |||||
| * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-11 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
* | | | | preparing for 6.3.3v6.3.3 | Rainer Gerhards | 2011-07-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | reverting back to non-debug settings | Rainer Gerhards | 2011-07-13 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | debug settings in testbench were accidently left on, including a special test case | ||||
* | | | | Merge branch 'master-newconf' | Rainer Gerhards | 2011-07-12 | 4 | -6/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/omfile.c | ||||
| * | | | | removed emergency config, do error reporting on fatal config file error | Rainer Gerhards | 2011-07-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fixed lexer: facilities local0-local7 were not correctly handled | Rainer Gerhards | 2011-07-11 | 3 | -4/+2 |
| | | | | | |||||
| * | | | | cleaup & emergency config system reactivated | Rainer Gerhards | 2011-07-09 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-07-11 | 1 | -2/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-11 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh | ||||
| | | * | | | preparing for 4.6.7 releasev4.6.7 | Rainer Gerhards | 2011-07-11 | 5 | -12/+12 |
| | | | | | | |||||
* | | | | | | preparing for 6.3.2v6.3.2 | Rainer Gerhards | 2011-07-06 | 1 | -8/+15 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-06-27 | 2 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c | ||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-21 | 10 | -54/+133 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-16 | 1 | -1/+5 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-14 | 4 | -55/+600 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tcpsrv.c | ||||
| * | | | | | | preparing for 5.9.0v5.9.0 | Rainer Gerhards | 2011-06-10 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | imfile: added $InputFileMaxLinesAtOnce directive | Rainer Gerhards | 2011-05-24 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-06-21 | 11 | -46/+136 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh | ||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 11 | -47/+138 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | ||||
| | * | | | | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least one case where this can occur is during thread shutdown, which may be initiated by lower activity. In most cases, this is quite unlikely to happen. However, if it does, data structures may be corrupted which could lead to fatal failure and segfault. I detected this via a testbench test, not a user report. But I assume that some users may have had unreproducable aborts that were cause by this bug. | ||||
| | * | | | | | preparing for 5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | testbench: added new tests for failover cases | Rainer Gerhards | 2011-06-20 | 10 | -52/+130 |
| | | |_|/ / | | |/| | | | |||||
| | * | | | | failover problem was not totally solved, now (hopefully ;)) | Rainer Gerhards | 2011-06-16 | 1 | -1/+5 |
| | | |/ / | | |/| | | | | | | | | | | | | I overlooked a border case, which came up on a larger testbench run. | ||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-14 | 3 | -0/+40 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/nsd_gtls.c tcpsrv.c tests/Makefile.am |