Rainer Gerhards
e4ac19d8ff
final cleanup for 5.6.1
2010-11-24 16:27:14 +01:00
Rainer Gerhards
b4da4fdac9
Merge branch 'v4-stable' into v5-stable
...
Conflicts:
configure.ac
2010-11-24 12:57:46 +01:00
Rainer Gerhards
600bc06638
Merge branch 'v3-stable' into v4-stable
...
Conflicts:
ChangeLog
configure.ac
2010-11-24 11:25:22 +01:00
Rainer Gerhards
925504d565
bugfix(important): problem in TLS handling could cause rsyslog to loop
...
... in a tight loop, effectively disabling functionality and bearing the
risk of unresponsiveness of the whole system.
Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
2010-11-24 11:14:21 +01:00
Rainer Gerhards
c470879eff
bugfix: testbench failed if imptcp was not enabled
2010-11-05 12:56:07 +01:00
Rainer Gerhards
7f6b471bf5
provide clear error message if platform does not support imptcp
2010-11-05 11:44:41 +01:00
Rainer Gerhards
cb04fc3972
permitted imptcp to work on systems which support epoll(), but not epoll_create().
...
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=204
Thanks to Nicholas Brink for reporting this problem.
2010-11-05 11:02:14 +01:00
Rainer Gerhards
71b8b60b22
bugfix: segfault when an *empty* template was used
...
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=206
Thanks to David Hill for alerting us.
2010-11-05 10:41:44 +01:00
varmojfekoj
7904ef4e37
bugfix: compile failed with --enable-unlimited-select
...
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-11-05 10:04:33 +01:00
Rainer Gerhards
096db025e2
fixing a potentially uninitialized variable
2010-10-19 04:03:43 -07:00
Rainer Gerhards
ed36822e37
Merge branch 'v4-stable' into v5-stable
...
Conflicts:
configure.ac
runtime/cfsysline.c
tools/ompipe.c
2010-10-19 12:54:38 +02:00
Rainer Gerhards
0a24b3afc0
fixing some compile problems on FreeBSD
2010-10-19 12:39:48 +02:00
Rainer Gerhards
7cdc7cbaa0
better error messages in testbench
2010-10-22 14:28:31 +02:00
Rainer Gerhards
0972943f52
fixed testbench compile problem on Solaris
2010-10-19 11:17:07 +02:00
Rainer Gerhards
2c9ca3fc9a
yet another forgotten testbench file
2010-10-22 14:38:52 +02:00
Rainer Gerhards
73e4b2edc8
added forgotten testbench file
2010-10-22 14:31:53 +02:00
Rainer Gerhards
cb65e72f1e
Merge branch 'v4-stable' into v5-stable
2010-10-22 14:29:04 +02:00
Rainer Gerhards
cd5190ad73
preparing for 5.6.0
2010-10-22 14:16:38 +02:00
Rainer Gerhards
f76b826989
solved minor compile problem (caused by merge)
2010-10-15 17:21:03 +02:00
Rainer Gerhards
5d8b1846ec
Merge branch 'v4-devel' into v5-beta
...
Conflicts:
Makefile.am
tests/tcpflood.c
2010-10-15 08:06:40 -07:00
Rainer Gerhards
3700a64d97
Merge branch 'v4-stable' into v4-devel
...
Conflicts:
ChangeLog
runtime/stream.c
2010-10-15 07:59:31 -07:00
Rainer Gerhards
c27a2ab686
fixed incomplete merge
2010-10-15 07:47:31 -07:00
Rainer Gerhards
90933057bc
imfile: bugfixes in regard to large files (> 2GB)
...
- bugfix: a couple of problems that imfile had on some platforms, namely
Ubuntu (not their fault, but occured there)
- bugfix: imfile utilizes 32 bit to track offset. Most importantly,
this problem can not experienced on Fedora 64 bit OS (which has
64 bit long's!)
2010-10-15 16:39:10 +02:00
Tom Bergfeld
e1437c7aa4
minor doc fix: updated tls doc to match new gnutls toolset
...
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-09-08 13:48:37 +02:00
izotov
6714bb931b
fixed some issue
2010-08-11 15:13:53 +02:00
Rainer Gerhards
053656420e
Merge branch 'v4-stable-imptcp' into v4-devel
2010-08-11 15:08:50 +02:00
Rainer Gerhards
809ed1768b
imptcp: added $InputPTCPServerAddtlFrameDelimiter directive
...
also improved testbench
2010-08-11 15:06:50 +02:00
Rainer Gerhards
4bf834bad6
fixed minor issue: imptcp did a close(-1) on each accept
2010-08-11 14:40:57 +02:00
Rainer Gerhards
e7d4ec890b
imptcp: added $InputPTCPServerNotifyOnConnectionClose directive
...
plus some minor cleanup
2010-08-11 14:38:21 +02:00
Rainer Gerhards
32e715929f
Merge branch 'v4-stable-imptcp' into tmp
...
Conflicts:
Makefile.am
configure.ac
runtime/rsyslog.h
tests/Makefile.am
2010-08-11 11:49:32 +02:00
Rainer Gerhards
c664adfa16
more testbench improvements and new tests
2010-08-10 19:34:42 +02:00
Rainer Gerhards
b5b4bd1389
small improvements to testbench
2010-08-10 18:29:22 +02:00
Rainer Gerhards
83948a07fd
some cleanup and minor optimization
2010-08-10 17:22:27 +02:00
Rainer Gerhards
ee4aed1713
added tests for imptcp and fixed some problems with it
...
it now also works reliably in edge-triggered mode
2010-08-10 16:18:21 +02:00
Rainer Gerhards
55256ac968
added imptcp
...
imptcp is a simplified, Linux-specific and potentielly fast
syslog plain tcp input plugin (NOT supporting TLS!)
2010-08-10 14:51:43 +02:00
Rainer Gerhards
d3fe3b28ac
preparing for 5.5.7
2010-08-09 14:30:18 +02:00
Rainer Gerhards
550afa1fef
Merge branch 'v4-devel'
...
Conflicts:
runtime/rsyslog.h
2010-08-09 10:54:58 +02:00
Rainer Gerhards
89f7dddf36
doc nit: wrong title in omuxsock page
...
thanks to David Lang for finding this issue
2010-08-09 08:09:15 +02:00
Rainer Gerhards
c8ee85614b
solving an error ID collision with v5 build
2010-08-06 17:43:01 +02:00
Rainer Gerhards
b6884a3e1b
fixing a nit introduced in last merge
2010-08-06 17:41:17 +02:00
Rainer Gerhards
40e70777ea
Merge branch 'v4-devel'
...
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/rsyslog_conf_modules.html
runtime/rsyslog.h
tests/Makefile.am
2010-08-06 17:32:29 +02:00
Rainer Gerhards
80ff634c84
added omuxsock, which permits to write message to local Unix sockets
...
this is the counterpart to imuxsock, enabling fast local forwarding
2010-08-06 17:25:38 +02:00
Rainer Gerhards
e4c926bfbc
changed omudpspoof default spoof address to simplify typical use case
2010-08-05 15:44:01 +02:00
Rainer Gerhards
27678dc430
minor bug fixes
...
- doc for pmlastmsg and ruleset parsers were hard to read
- pmrfc3164sd had wrong name
2010-08-05 14:27:37 +02:00
Rainer Gerhards
1b1b6b85e6
Merge branch 'v4-devel'
...
Conflicts:
doc/Makefile.am
doc/manual.html
doc/professional_support.html
2010-08-05 14:10:45 +02:00
Rainer Gerhards
1be7973069
Merge branch 'v4-stable' into v4-devel
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2010-08-05 14:09:06 +02:00
Rainer Gerhards
318adf58de
preparing for 4.6.4
2010-08-05 13:57:12 +02:00
Rainer Gerhards
9b3ed84087
Merge branch 'v3-stable' into v4-stable
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/professional_support.html
2010-08-05 11:37:38 +02:00
Rainer Gerhards
33a2855c69
preparing for 3.22.2
2010-08-05 11:33:14 +02:00
Rainer Gerhards
ebba229db9
Merge branch 'v4-devel' into master
...
Conflicts:
ChangeLog
2010-08-05 08:40:18 +02:00
