rsyslog.git - rsyslog development for Lumberjack - various unofficial and potentially rebased branches

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable' into master	Rainer Gerhards	2012-01-18	1	-16/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
\| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-16	1	-16/+14
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
\| \| *	license changes	Rainer Gerhards	2012-01-16	1	-16/+14
\| \| \|
* \| \|	added capability for imtcp to activate keep-alive packets	Rainer Gerhards	2011-05-09	1	-1/+1
\|/ / \| \| \| \| \| \| \| \|	at the socket layer. reference: http://kb.monitorware.com/post20791.html
* \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-05-02	1	-2/+4
\|\\| \| \| \| \| \| \| \| \|	Conflicts: tcpsrv.c
\| *	slightly more informative errmsg when TCP connection is aborted	Rainer Gerhards	2011-05-02	1	-2/+4
\| \|
* \|	added work-around for bug in gtls, which causes fd leak when using TLS	Bojan Smojver	2011-02-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \|	enhanced test environment (including testbench)	Rainer Gerhards	2009-10-22	1	-1/+1
\|/ \| \| \| \| \| \| \|	support for enhancing probability of memory addressing failure by using non-NULL default value for malloced memory (optional, only if requested by configure option). This helps to track down some otherwise undetected issues within the testbench and is expected to be very useful in the future.
*	strmsrv now supports KEEPALIVE socket option	Rainer Gerhards	2009-06-02	1	-0/+14
\|
*	added a generic network stream server	Rainer Gerhards	2009-06-02	1	-0/+952
	(in addition to rather specific syslog tcp server)