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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable-newstats'	Rainer Gerhards	2012-04-07	1	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
\| *	added configuration directive to disable octet-counted framing	Rainer Gerhards	2012-03-20	1	-0/+6
\| \| \| \| \| \| \| \|	for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
* \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-06-27	1	-1/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	added support to control KEEPALIVE settings in imptcp	Rainer Gerhards	2011-05-13	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \|	this has not yet been added to imtcp, but could be done on request
\| * \|	imptcp: added capability to activate keep-alive at socket layer	Rainer Gerhards	2011-05-11	1	-1/+4
\| \|/
* /	cleanup of imptcp; doc added; config statement for workers added	Rainer Gerhards	2011-01-31	1	-0/+5
\|/
*	imptcp: added $InputPTCPServerAddtlFrameDelimiter directive	Rainer Gerhards	2010-08-11	1	-2/+1
\| \| \| \|	also improved testbench
*	imptcp: added $InputPTCPServerNotifyOnConnectionClose directive	Rainer Gerhards	2010-08-11	1	-3/+0
\| \| \| \|	plus some minor cleanup
*	added imptcp	Rainer Gerhards	2010-08-10	1	-0/+84
	imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!)