Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-09 | 2 | -4/+3 |
|\ | | | | | | | | | Conflicts: tools/omfwd.c | ||||
| * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-09 | 1 | -2/+2 |
| |\ | |||||
| | * | bugfix: invalid storage type for config variables | Rainer Gerhards | 2011-05-09 | 1 | -1/+1 |
| | | | |||||
| | * | bugfix: stream driver mode was not correctly set on tcp ouput on big endian ↵ | Tomas Heinrich | 2011-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | systems. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | bugfix(minor): improper template function call in syslogd.c | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | omfwd: made send function handling incomplete sends correctly | Rainer Gerhards | 2011-04-04 | 1 | -12/+7 |
| | | | |||||
* | | | added one more testcase for sending TCP/TLS syslog | Rainer Gerhards | 2011-04-04 | 1 | -0/+4 |
| | | | |||||
* | | | omfwd: speeded up tcp forwarding by reducing number of API calls | Rainer Gerhards | 2011-04-04 | 1 | -11/+66 |
| | | | |||||
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 2 | -3/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| * | | bugfix: RFC5424 parser confused by empty structured data | Rainer Gerhards | 2011-03-22 | 1 | -2/+1 |
| | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=237 | ||||
| * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | * | | fixed a regression of last patch and some cleanup | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 13 | -0/+17 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh | ||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c | ||||
| | * | | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 | ||||
| * | | | Merge branch 'v5-beta-gtls-fix' into v5-beta | Rainer Gerhards | 2011-03-06 | 12 | -0/+12 |
| |\ \ \ | |||||
| | * | | | added work-around for bug in gtls, which causes fd leak when using TLS | Bojan Smojver | 2011-02-23 | 12 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 2 | -3/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | cosmetic: removing commented-out testing aid | Rainer Gerhards | 2011-02-25 | 1 | -1/+0 |
| |/ / / | |||||
| * | | | bugfix (minor): warning message suggested invalid compatibility mode | Rainer Gerhards | 2011-02-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | regression: fixed compile error with --enable-debug | Rainer Gerhards | 2011-02-21 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 3 | -10/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c | ||||
| * | | | bugfix: fixed compile problem due to empty structs | Dražen Kačar | 2011-02-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | this occured only on some platforms/compilers. thanks to Dražen Kačar for the fix Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | cleanup: no longer parameter in iminternal system removed | Rainer Gerhards | 2011-02-16 | 3 | -10/+6 |
| | | | | |||||
* | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-11 | 1 | -3/+36 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | fixed some compile issues in recent systemd patch | Rainer Gerhards | 2011-02-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | Improved systemd socket activation support | Marius Tomaschewski | 2011-02-11 | 1 | -3/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | Support for multiple unix sockets and activation in forking mode Signed-off-by: Marius Tomaschewski <mt@suse.de> | ||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 5 | -17/+10 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c | ||||
| * | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -3/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c | ||||
| | * | | | added $LocalHostName config directive & some bugfixing | Rainer Gerhards | 2010-12-16 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect | ||||
| | * | | | cleanup of cosmetic nit (result of clang static code analyser run) | Rainer Gerhards | 2010-12-16 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-12-16 | 5 | -8/+2 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | Conflicts: runtime/parser.c | ||||
| | * | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-10-19 | 2 | -1/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/cfsysline.c tools/ompipe.c | ||||
| * | \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2010-12-17 | 5 | -7/+3 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2010-12-16 | 4 | -6/+2 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c | ||||
| | | * | | | some cleanup based on clang static analyzer results | Rainer Gerhards | 2010-12-16 | 4 | -6/+0 |
| | | | | | | |||||
| | | * | | | typo fix (thanks to Björn Påhlsson for finding it!) | Michael Biebl | 2010-11-30 | 1 | -2/+2 |
| | | | |/ | | | |/| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | | fixed cosmetic nit (as a result of clang static code analyzer run) | Rainer Gerhards | 2010-12-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | bugfix: one type of 64bit atomics was enabled when 32bit atomics were supported | Rainer Gerhards | 2010-12-02 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | also cleaned up some minor things | ||||
* | | | | | mmnormalize loads & runs (basic testing done) | Rainer Gerhards | 2010-12-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-11-25 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | | | | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2010-11-25 | 1 | -1/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html plugins/imfile/imfile.c runtime/rsyslog.h | ||||
| | * | | | bugfix: replacements for atomic operations for non-int sized types had problems. | Rainer Gerhards | 2010-11-25 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | At least one instance of that problem could potentially lead to abort (inside omfile). | ||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-22 | 2 | -1/+2 |
|\| | | | | |||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2010-10-22 | 2 | -1/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2010-10-19 | 2 | -1/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c | ||||
| | | * | | fixing some compile problems on FreeBSD | Rainer Gerhards | 2010-10-19 | 2 | -1/+2 |
| | | | | | |||||
| | * | | | Merge branch 'v4-devel' into v5-beta | Rainer Gerhards | 2010-10-15 | 1 | -1/+1 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c | ||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-15 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | removed need for math library | Rainer Gerhards | 2010-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by doing math a little bit more optimal in hash table code. Also reduced memory requirement for imuxsock hash tables (expected number of connections was set too high -- table can be extended dynamically). |