rsyslog - Modifications to rsyslog---see v3-stable-kaz branch

	Commit message (Collapse)	Author	Age	Files	Lines
*	undoing v6.1 config scoping interface, part I	Rainer Gerhards	2012-01-18	7	-37/+28
\| \| \| \|	The most common files are now changed, more needs to be done.
*	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-18	67	-1036/+912
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
\| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-16	65	-1001/+882
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
\| \| *	license changes	Rainer Gerhards	2012-01-16	45	-704/+617
\| \| \|
\| \| *	runtime license change	Rainer Gerhards	2012-01-16	20	-297/+265
\| \| \|
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-14	2	-35/+30
\| \|\\|
\| \| *	license change	Rainer Gerhards	2012-01-14	2	-35/+30
\| \| \| \| \| \| \| \| \| \| \| \|	after careful consideration of affected code
* \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-09	2	-5/+7
\|\\| \|
\| * \|	bugfix: instabilities when using RFC5424 header fields	Kaiwang Chen	2012-01-09	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| * \|	bugfix: stats counter were not properly initialized on creation	Rainer Gerhards	2011-12-20	1	-0/+2
\| \| \|
* \| \|	removing $Begin, $End, $StrictScoping directives	Rainer Gerhards	2012-01-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. -------------------------
* \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-12-01	1	-1/+1
\|\\| \|
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-12-01	1	-1/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: action.c
\| \| *	Merge branch 'v3-stable' into v4-stable	Rainer Gerhards	2011-12-01	1	-1/+1
\| \| \|\
\| \| \| *	bugfix: cosmetic: proper constant used instead of number in open call	Tomas Heinrich	2011-12-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-10-27	1	-2/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-10-27	1	-2/+6
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \|	bugfix: potential abort after reading invalid X.509 certificate	Tomas Heinrich	2011-10-27	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| \| * \|	Merge branch 'v4-stable' into v4-beta	Andre Lorbach	2011-08-11	1	-1/+1
\| \| \|\ \
\| \| \| * \|	Added MsgDup bugfix from v5-stable into v4-stable branch	Andre Lorbach	2011-08-11	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Merge branch 'v4-stable' into v4-beta	Rainer Gerhards	2011-08-09	1	-1/+1
\| \| \|\\| \|
\| \| * \| \|	Merge branch 'v4-stable' into v4-beta	Andre Lorbach	2011-08-05	1	-7/+7
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \| \| \|	issue a warning message for old-style dynafile action	Rainer Gerhards	2011-07-11	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-07-11	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \ \ \ \	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-06-14	1	-0/+3
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-05-11	1	-2/+6
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-05-09	2	-11/+23
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
\| \| * \| \| \| \| \| \| \|	bugfix: a slightly more informative error message when a TCP	Rainer Gerhards	2011-05-02	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	connections is aborted
\| \| * \| \| \| \| \| \| \|	bugfix: PRI was invalid on Solaris for message from local log socket	Corey Smith	2011-03-24	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: root <root@localhost.localdomain>
* \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-10-21	2	-1/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \| \| \| \| \| \|	bugfix: missing whitespace after property-based filter was not detected	Rainer Gerhards	2011-10-21	2	-1/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-10-21	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/rsyslog_recording_pri.html
\| * \| \| \| \| \| \| \| \|	bugfix: $OMFileFlushInterval period was doubled - now using correct value	Rainer Gerhards	2011-10-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	bugfix (kind of): removed numerical part from pri-text	Rainer Gerhards	2011-10-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	see v6 compatibility document for reasons
* \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-10-13	2	-11/+51
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \| \| \| \| \| \|	bugfix: race condition when extracting structured data and PROCID	Rainer Gerhards	2011-10-13	1	-3/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	same issue as previous commit for PROGNAME and APPNAME
\| * \| \| \| \| \| \| \| \|	bugfix: race condition when extracting program name and APPNAME	Rainer Gerhards	2011-10-13	1	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	could lead to invalid characters e.g. in dynamic file names
\| * \| \| \| \| \| \| \| \|	bugfix: imfile did invalid system call under some circumstances	Rainer Gerhards	2011-10-07	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas.
* \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-09-26	1	-1/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \| \| \| \| \| \|	bugfix: omfile returns fatal error code for things that go really wrong	Rainer Gerhards	2011-09-26	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
* \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Andre Lorbach	2011-08-18	2	-2/+19
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| * \| \| \| \| \| \| \| \|	removed debug code from action.c and runtime/queue.c after testing	Andre Lorbach	2011-08-18	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	bugfix: fixed incorrect state handling for Discard Action (transactions)	Andre Lorbach	2011-08-18	1	-0/+13
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Added debug output into message parsers needed for bugtracking	Andre Lorbach	2011-08-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed version to 5.8.5-pre1
\| * \| \| \| \| \| \| \| \|	bugfixes for tag emulation	Rainer Gerhards	2011-08-11	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation
* \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Andre Lorbach	2011-08-11	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \| \| \| \| \| \|	Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTag	Andre Lorbach	2011-08-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The syslogtag of the duplicated message could get contain garbage at the end as the string terminating NULL Byte was missing.
* \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Andre Lorbach	2011-08-10	1	-3/+10
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'v5-stable-msgidfix' into v5-stable	Andre Lorbach	2011-08-10	1	-3/+10
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Cosmetic change	Andre Lorbach	2011-07-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|