1317 Commits

Author SHA1 Message Date
Rainer Gerhards
abef390dae Merge branch 'beta' into master
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tools/syslogd.c
2010-03-01 14:21:49 +01:00
Rainer Gerhards
b4cdb7c997 cosmetic: added bugentry to changelog 2010-03-01 14:10:35 +01:00
Rainer Gerhards
eb3afa8000 Merge branch 'v4-stable' into tmp 2010-03-01 12:52:25 +01:00
Rainer Gerhards
af6c73439e cosmetic: bugfix in ChangeLog highlighted 2010-03-01 12:51:15 +01:00
Rainer Gerhards
facf8cc3e6 Merge branch 'v3-stable' into v4-stable
Conflicts:
	runtime/ctok.c
2010-03-01 12:47:28 +01:00
Rainer Gerhards
01e6df368c bugfix: comment char ('#') in literal terminated script parsing
...and thus could not be used.
but tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=119
2010-03-01 12:44:57 +01:00
Rainer Gerhards
ebf0582261 added capability to turn off standard LF delimiter in TCP server
via new directive "$InputTCPServerDisableLFDelimiter on"
2010-03-01 11:33:48 +01:00
Rainer Gerhards
f12a1995e4 bugfix: fixed problem that caused compilation on FreeBSD 9.0 to fail.
bugtracker: http://bugzilla.adiscon.com/show_bug.cgi?id=181
Thanks to Christiano for reporting.
2010-02-28 18:33:08 +01:00
Rainer Gerhards
0995bff594 Merge branch 'v4-stable' into 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tools/syslogd.c
2010-02-25 14:42:21 +01:00
Rainer Gerhards
89092a5e4a Merge branch 'v4-stable' into tmp
Conflicts:
	configure.ac
	doc/manual.html
2010-02-25 14:33:27 +01:00
Rainer Gerhards
76ded5e98b doc bugfix: ChangeLog heading claimed that 4.6.0 was v4-beta
while the rest of the entry correctly said it was stable.
2010-02-25 10:09:47 +01:00
Rainer Gerhards
ff0f045612 Merge branch 'v4-beta' into master
Conflicts:
	doc/manual.html
	tools/syslogd.c
2010-02-24 11:04:46 +01:00
Rainer Gerhards
8e027749b9 preparing for 4.6.0 release 2010-02-24 10:22:54 +01:00
Rainer Gerhards
af5fb078d4 message parser fixes and testbench enhancements
- improved testbench to contain samples for totally malformed messages
  which miss parts of the message content
- bugfix: some malformed messages could lead to a missing LF inside files
  or some other missing parts of the template content.
- bugfix: if a message ended immediately with a hostname, the hostname
  was mistakenly interpreted as TAG, and localhost be used as hostname
2010-02-22 14:25:56 +01:00
Rainer Gerhards
c577e9c64c bugfix: message without MSG part could case a segfault
[backported from v5 commit 98d1ed504ec001728955a5bcd7916f64cd85f39f]
This actually was a "recent" regression, but I did not realize that it
was introduced by the performance optimization in v4-devel. Shame on
me for having two devel versions at the same time...
2010-02-22 09:31:10 +01:00
Rainer Gerhards
200e2b6630 Merge branch 'beta' into master
Conflicts:
	ChangeLog
	tests/parsertest.sh
2010-02-10 17:41:28 +01:00
Rainer Gerhards
c8ebe62337 Merge branch 'v4-beta' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imuxsock/imuxsock.c
	template.c
	tests/Makefile.am
	tests/parsertest.sh
2010-02-10 16:35:12 +01:00
Rainer Gerhards
76b3f2cd87 preparing for 4.5.8 2010-02-10 15:26:27 +01:00
Rainer Gerhards
e1584b71f3 several bugfixes for the property replacer
- bugfix: property replacer returned invalid parameters under some (unusual)
  conditions. In extreme cases, this could lead to garbled logs and/or
  a system failure.
- bugfix: invalid length returned (often) when using regular expressions
  inside the property replacer
- bugfix: submatch regex in property replacer did not honor "return 0 on
  no match" config case
2010-02-08 16:53:30 +01:00
Rainer Gerhards
c34e7d2114 integrated new PostgreSQL doc
converted to html, linked, etc...
2010-02-08 14:30:08 +01:00
Rainer Gerhards
497bfeb287 bugfix: omruleset failed to work in many cases
bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=179
Thanks to Ryan B. Lynch for reporting this issue.
2010-02-08 13:57:59 +01:00
Rainer Gerhards
85a0ed1cce bugfix: imuxsock incorrectly stated inputname "imudp"
Thanks to Ryan Lynch for reporting this.
2010-02-06 12:03:24 +01:00
Rainer Gerhards
c1e189608a updated project status 2010-02-05 15:48:01 +01:00
Rainer Gerhards
ddf09f54e1 preparing for 5.5.2 2010-02-05 15:33:18 +01:00
Rainer Gerhards
8149d06f97 Merge branch 'beta' 2010-02-04 16:51:53 +01:00
Rainer Gerhards
d71e8672c9 Merge branch 'v4-beta' into beta 2010-02-04 16:51:43 +01:00
Rainer Gerhards
ef193bf0ae Merge branch 'v4-stable' into v4-beta 2010-02-04 16:43:21 +01:00
varmojfekoj
8c3ab2e26f bugfix: several smaller bugs resolved after flexelint review
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-02-04 16:02:57 +01:00
Rainer Gerhards
4cefc40064 Merge branch 'beta'
Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/manual.html
2010-02-03 15:46:35 +01:00
Rainer Gerhards
9045537841 Merge branch 'v4-beta' into beta 2010-02-03 15:42:40 +01:00
Cristiano
66d129c9ca (slightly) enhanced support for FreeBSD by setting _PATH_MODDIR to the correct value on FreeBSD.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-02-03 15:42:14 +01:00
trey
1fc8e4372b patch to make rsyslog compile under Apple OS X
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-02-03 14:55:35 +01:00
Rainer Gerhards
38cb392672 replaced data type "bool" by "sbool" because this created some portability issues 2010-02-02 15:51:01 +01:00
Rainer Gerhards
85045270f6 added $Escape8BitCharactersOnReceive directive
Thanks to David Lang for suggesting this functionality.
2010-01-27 15:13:54 +01:00
Rainer Gerhards
4ed9a09e31 preparing for 5.3.7 2010-01-27 11:17:26 +01:00
Rainer Gerhards
074ec9495e backporting bugfixes from 5.2.2
- bugfix: queues in direct mode could case a segfault, especially if an
  action failed for action queues. The issue was an invalid increment of
  a stack-based pointer which lead to destruction of the stack frame and
  thus a segfault on function return.
  Thanks to Michael Biebl for alerting us on this problem.
  [backport from 5.5.2]
- bugfix: wrong memory assignment for a config variable (probably
  without causing any harm) [backport from 5.2.2]
2010-01-27 09:52:15 +01:00
Rainer Gerhards
bab3ee566c bugfix: queues in direct mode could case a segfault,...
especially if an action failed for action queues. The issue was an
invalid increment of a stack-based pointer which lead to destruction
of the stack frame and thus a segfault on function return.

Thanks to Michael Biebl for alerting us on this problem.
2010-01-26 16:54:35 +01:00
Rainer Gerhards
855f349238 Merge branch 'beta' 2010-01-26 12:23:53 +01:00
Rainer Gerhards
7f4972b9fa Merge branch 'v4-beta' into beta
Conflicts:
	ChangeLog
	runtime/queue.c
2010-01-26 12:09:48 +01:00
Rainer Gerhards
62e00d7a1c Merge branch 'v4-beta' into tmp
Conflicts:
	ChangeLog
2010-01-26 12:03:50 +01:00
Rainer Gerhards
939852b1cd Merge branch 'v4-stable' into v4-beta
Conflicts:
	runtime/queue.c
2010-01-26 12:02:07 +01:00
varmojfekoj
7d098f14cb bugfix: potential segfault on queue shutdown
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-01-26 11:54:33 +01:00
Rainer Gerhards
2c86548063 Merge branch 'queuepatch' into v4-betanew
Conflicts:
	runtime/queue.c
2010-01-26 11:33:32 +01:00
Rainer Gerhards
bd03b86c63 bugfix: -d did not enable display of debug messages
regression from introduction of "debug on demand" mode
Thanks to Michael Biebl for reporting this bug
2010-01-19 15:49:26 +01:00
Rainer Gerhards
9cfa072caa bugfix: blanks inside file names did not terminate file name parsing.
This could reslult in the whole rest of a line (including comments)
to be treated as file name in "write to file" actions.
Thanks to Jack for reporting this issue.
2010-01-19 15:15:22 +01:00
Rainer Gerhards
b88c4885b4 Merge branch 'beta'
Conflicts:
	ChangeLog
2010-01-19 14:40:55 +01:00
Rainer Gerhards
9901996b5b Merge branch 'v4-beta' into beta
Conflicts:
	ChangeLog
2010-01-15 17:03:51 +01:00
Rainer Gerhards
5b4e06fc28 bugfix: rsyslog hangs when writing to a named pipe which nobody was reading.
Thanks to Michael Biebl for reporting this bug.
2010-01-15 17:01:10 +01:00
Rainer Gerhards
88e01dc3ff Merge branch 'beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2010-01-13 12:48:59 +01:00
Rainer Gerhards
b7ea09361c prepared for 5.3.6 2010-01-13 12:41:45 +01:00