Rainer Gerhards
931ef2c37c
Merge branch 'v7-devel'
2014-01-21 12:08:55 +01:00
Rainer Gerhards
4b5eba722c
Merge branch 'v7-stable-stdlog' into v7-devel
...
Conflicts:
runtime/glbl.c
runtime/glbl.h
tools/syslogd.c
2014-01-21 12:08:42 +01:00
Rainer Gerhards
1424913197
build: require libstdlog
2014-01-21 09:43:43 +01:00
Rainer Gerhards
8856b1c51d
Merge branch 'master' into master-imfile-v8
2014-01-13 14:34:55 +01:00
Rainer Gerhards
98b00367c1
prepare for 8.1.4 release
2014-01-10 14:44:22 +01:00
Rainer Gerhards
481f2fb96a
prepare for 7.4.8 release
2014-01-08 13:02:43 +01:00
Rainer Gerhards
57cd73046e
prepare for 7.5.8
2014-01-08 09:37:31 +01:00
Rainer Gerhards
02da275527
imrelp: support for TCP KEEPALIVE added
2013-12-10 17:01:43 +01:00
Rainer Gerhards
53f4e19761
prepare for 7.4.7 release
2013-12-09 12:15:14 +01:00
Rainer Gerhards
95db0ce2fa
prepare for 8.1.3 release
2013-12-06 11:35:26 +01:00
Rainer Gerhards
f0e7a92dc7
preparing for 8.1.2 release
2013-11-28 12:02:57 +01:00
Rainer Gerhards
6e906818fc
Merge branch 'master-lognorm1'
2013-11-28 11:43:45 +01:00
Rainer Gerhards
48f646c149
Merge branch 'v7-stable' into v7-devel
2013-11-27 17:47:30 +01:00
Rainer Gerhards
f5926d4c2c
build system: check if jemalloc is present (if requested)
2013-11-27 09:45:52 +01:00
Rainer Gerhards
5dea3221bd
add support for jemalloc (experimental)
2013-11-26 11:01:16 +01:00
Rainer Gerhards
ef3cadbef7
require 1.0.0 release of liblognorm
...
as this is the official name of liblognorm1's first release
2013-11-25 12:50:27 +01:00
Pavel Levshin
08fa9f1d3b
Rewrite mmnormalize to use liblognorm 0.4.0 with JSON interface
...
Conflicts:
plugins/mmnormalize/mmnormalize.c
2013-11-25 12:49:52 +01:00
Rainer Gerhards
bf27beb9e2
revert configure change for patch to apply
2013-11-25 12:49:04 +01:00
Rainer Gerhards
a56bf34695
Merge branch 'v7-stable'
2013-11-25 12:00:34 +01:00
Rainer Gerhards
0df879fada
bumping version number
2013-11-25 09:35:18 +01:00
Rainer Gerhards
a2b4a8ac92
prepare for upcoming liblognorm 1.0.0 release
...
The new liblognorm relase has an incompatible API, so
we cannot use it to compile this version of rsyslog.
2013-11-24 10:14:16 +01:00
Rainer Gerhards
c6db0c684b
prepare for 8.1.1 release
2013-11-19 12:32:05 +01:00
Rainer Gerhards
4c30465723
bump version number
2013-11-13 16:55:18 +01:00
Rainer Gerhards
14f3b45151
module omruleset is no longer enabled by default.
...
Note that it has been deprecated in v7 and been replaced by the "call"
statement. Also, it can still be build without problems, the option must
just explicitely be given.
2013-10-31 18:21:47 +01:00
Rainer Gerhards
73e7088748
prepare for 7.4.6 release
2013-10-29 16:21:29 +01:00
Rainer Gerhards
6106c05fcf
require libestr 0.1.9
2013-10-26 16:02:42 +02:00
Rainer Gerhards
4afa6231e3
Merge branch 'master' into master-imfile
2013-10-17 09:29:28 +02:00
Rainer Gerhards
c6337345d2
Merge branch 'v7-stable'
2013-10-16 17:18:59 +02:00
Rainer Gerhards
b103f37fb2
require libestr 0.1.8, as there are bugs in previous versions that affect us
2013-10-16 17:18:32 +02:00
Rainer Gerhards
6d2787f009
prepare for 7.5.6 release
2013-10-16 16:53:29 +02:00
Pavel Levshin
1064e566bc
add module mmsequence
2013-10-16 13:39:35 +02:00
Rainer Gerhards
bb2ed66c89
Merge branch 'v7-stable'
2013-10-26 16:02:58 +02:00
Pavel Levshin
200b434316
Make use of int64 json numbers, if available
2013-10-26 15:40:50 +02:00
Rainer Gerhards
a000bd661e
slight performance optimization if GCC is used
...
We give branch prediction hints for the frequent RETiRet macro which is
used for error handling. Some slight performance gain is to be expected
from that.
2013-10-26 13:09:59 +02:00
Rainer Gerhards
df62b4c015
preparing for 7.4.5
2013-10-16 13:14:21 +02:00
Rainer Gerhards
d1547fd962
Merge branch 'master' into master-imfile
2013-10-16 12:47:04 +02:00
Rainer Gerhards
f9c37fcc78
bugfix: imfile did not properly initialize strm object ptr
...
This did not cause any real issue, as with the current config system
the zerod-out static memory actually was initialized. However, this
posed problems after we moved to dynamic memory alloc.
2013-10-15 15:19:21 +02:00
Rainer Gerhards
51e275f2a8
imfile milestone: add wdmap inotify support structures
...
untested
2013-10-15 10:00:44 +02:00
Rainer Gerhards
f4355f0bf7
add check for inotify availability
2013-10-15 08:48:09 +02:00
Rainer Gerhards
a4d4bcacea
Merge branch 'v7-stable'
2013-10-10 12:00:17 +02:00
Rainer Gerhards
81e9afee45
require libestr 0.1.7
2013-10-10 11:46:36 +02:00
Rainer Gerhards
9b104f782c
preparing for 7.5.4
2013-10-07 14:16:32 +02:00
Rainer Gerhards
a8b1e96d7b
Merge branch 'v7-stable-mmrfc5424addhmac'
...
Conflicts:
Makefile.am
configure.ac
runtime/msg.c
runtime/rsyslog.h
2013-09-26 12:41:50 +02:00
Rainer Gerhards
593c8e41d1
milestone: mmpstrucdata parses STRUCTURED-DATA (but does not yet store it)
2013-09-23 16:10:12 +02:00
Rainer Gerhards
cc66561cc2
Merge branch 'v7-stable-mmrfc5424addhmac'
2013-09-23 07:56:44 +02:00
Rainer Gerhards
194c3c45d0
mmrfc5424addhmac: add openssl configure check & update build system
2013-09-23 07:55:59 +02:00
Rainer Gerhards
8929d2f71b
mmutf8fix: new module to fix invalid UTF-8 sequences
2013-09-20 11:10:33 +02:00
Rainer Gerhards
d5dad734ab
Merge branch 'v7-stable-mmrfc5424addhmac'
...
Conflicts:
Makefile.am
configure.ac
2013-09-20 09:06:03 +02:00
Rainer Gerhards
b1e2559b17
mmrfc5424addhmac: add module skeleton
2013-09-18 17:12:33 +02:00
Rainer Gerhards
a7b928dbc4
preparing for 7.5.3 release
2013-09-11 12:38:59 +02:00
