rsyslog.git/plugins/imfile, branch v6.1.10 rsyslog development for Lumberjack - various unofficial and potentially rebased branches fixed double-free regerssion, probably caused by last merge 2011-03-14T13:37:40+00:00 Rainer Gerhards rgerhards@adiscon.com 2011-03-14T13:37:40+00:00 8ca7467ed408965b44864b507e734e209d35338a 






Merge branch 'v5-devel'
2011-03-14T11:49:12+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-03-14T11:49:12+00:00

ef45e0ff714767b58e9069a1db78d92ef370e498

Conflicts:
	tests/diag.sh





Conflicts:
	tests/diag.sh







fixing cosmetic memory leak in imdiag, imfile
2011-03-14T11:17:27+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-03-14T11:17:27+00:00

00771a760bf2603276be906ad168ed50c90bf412

This had no real consequences, as it happend exactly
once during the runtime, so the OS cleaned up. However, it
broke the valgrind testbench.





This had no real consequences, as it happend exactly
once during the runtime, so the OS cleaned up. However, it
broke the valgrind testbench.







bugfix: very minor memory leak in imfile
2011-03-11T14:45:44+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-03-11T14:45:44+00:00

804cbee541f24f61be41d6405754bf082da288a0

almost cosmetic: leaks a few bytes once during a run -- more a problem
for valgrind testing -- not for practical use





almost cosmetic: leaks a few bytes once during a run -- more a problem
for valgrind testing -- not for practical use







Merge branch 'v5-beta'
2011-03-11T09:24:58+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-03-11T09:24:58+00:00

6c3ef4dacfa0a0fb0099299e30335c788704fe2a

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh





Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh







added work-around for bug in gtls, which causes fd leak when using TLS
2011-02-23T10:25:43+00:00

Bojan Smojver
bojan@rexursive.com

2011-02-23T10:25:43+00:00

d1eb6e0edc51a78f3209448e800b25eda50340f2

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>





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'
2011-02-18T15:52:08+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-02-18T15:52:08+00:00

a8760241a30dc2618c53c569d23acdec1e06908e

Conflicts:
	plugins/imfile/imfile.c





Conflicts:
	plugins/imfile/imfile.c







enhance: imfile did not yet support multiple rulesets, now added
2011-02-18T15:04:50+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-02-18T15:04:50+00:00

2f1ef6164afa3a91f0bdd92507d0e8d557bea555

we do this directly in the beta because a) it does not affect existing
functionality and b) one may argue that this missing functionality is
close to a bug.





we do this directly in the beta because a) it does not affect existing
functionality and b) one may argue that this missing functionality is
close to a bug.







Merge branch 'v5-beta'
2011-02-18T09:51:14+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-02-18T09:51:14+00:00

9568e7dbbb50ceb7464b659283e97a63ba3b1bd6

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/glbl.c
	tools/omdiscard.c





Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/glbl.c
	tools/omdiscard.c







bugfix: very long running actions could prevent shutdown under some circumstances
2011-02-11T16:47:30+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-02-11T16:47:30+00:00

f3d354da3e373f9c4890a78e5274a6ba02f1c8cb

This has now been solved, at least for common situations.





This has now been solved, at least for common situations.