Rainer Gerhards
f29ab45c69
imfile: refactor naming
2014-10-15 11:28:28 +02:00
Rainer Gerhards
3b7bee68fc
Merge branch 'v8-stable'
2014-10-13 15:44:36 +02:00
Rainer Gerhards
503d75050b
bugfix imfile:file processing in inotify mode was stalled sometimes
...
closes https://github.com/rsyslog/rsyslog/issues/134
2014-10-13 15:44:10 +02:00
Rainer Gerhards
054fab8c0c
datatype for pri in parser.c was left at unsigned, now use dedicated one
2014-10-09 13:24:33 +02:00
Rainer Gerhards
948bc571a3
Merge branch 'v8-stable'
2014-10-09 08:23:46 +02:00
Rainer Gerhards
8bf43525fe
bugfix imfile: segfault on startup in "inotify" mode
...
A segfault happened when more than one file was monitored.
2014-10-09 08:22:39 +02:00
Rainer Gerhards
0cc1ef8ac8
Merge branch 'v8-stable'
...
Conflicts:
plugins/ommail/ommail.c
2014-10-08 19:06:47 +02:00
Rainer Gerhards
9da526ef5c
ChangeLog: forgotten to add proper credits
2014-10-08 15:59:29 +02:00
Rainer Gerhards
67899658bf
maintain ChangeLog
2014-10-08 15:58:09 +02:00
Rainer Gerhards
5b501968b3
ommail: remove no longer used variable
2014-10-08 15:55:57 +02:00
Paul Freeman
f262e19111
Fix only generate a single To: rfc2822 header with comma separator for
...
multiple recipients
2014-10-08 15:42:36 +02:00
Paul Freeman
5af0aabc64
Fix typo in X-Mailer: header
2014-10-08 15:42:22 +02:00
Paul Freeman
a63052b9c1
Fix Date: header to be rfc2822 compliant
2014-10-08 15:42:09 +02:00
Rainer Gerhards
b18db345a1
Merge remote-tracking branch 'github/master'
2014-10-08 15:41:33 +02:00
Rainer Gerhards
63bd0c4dc6
Merge pull request #130 from cacheus/master
...
Fixup some minor issues in ommail
2014-10-08 15:41:09 +02:00
Rainer Gerhards
2bd17e5313
imjournal: remove unnecessary header
2014-10-08 13:11:22 +02:00
Rainer Gerhards
87cef6528a
Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog
2014-10-08 12:50:53 +02:00
Rainer Gerhards
9895ce37f2
Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog
2014-10-08 12:50:25 +02:00
Rainer Gerhards
a407348963
refactor PRI-handling code
2014-10-08 12:50:10 +02:00
Rainer Gerhards
afa3128c93
Merge branch 'v8-stable'
2014-10-08 12:41:49 +02:00
Rainer Gerhards
92bd543c8a
maintain ChangeLog
2014-10-08 12:41:33 +02:00
Rainer Gerhards
7d9bc80635
Merge branch 'v7-stable' into v8-stable
2014-10-08 12:41:09 +02:00
Rainer Gerhards
b33df7a083
bugfix: imjournal did not build properly
...
The build succeeded, but the module did not load due to a type in
a support function name, which kept unresolved during load.
2014-10-08 12:39:44 +02:00
Rainer Gerhards
04a9db02d4
Merge branch 'v8-stable'
2014-10-08 10:56:11 +02:00
Rainer Gerhards
ebefb3c73a
maintain ChangeLog
2014-10-08 10:56:02 +02:00
Rainer Gerhards
826d2557c3
Merge branch 'v7-stable' into v8-stable
2014-10-08 10:55:44 +02:00
Rainer Gerhards
a326d87cd3
bugfix imklog: missing prototype
2014-10-08 10:54:35 +02:00
Rainer Gerhards
35685def5c
bugfix imklog: pri was miscalculated
...
actually, the pri was totally off the real value for PRIs > 9
2014-10-08 10:53:33 +02:00
Rainer Gerhards
00fa31afaf
nits: small corrections to ChangeLog
2014-10-07 12:03:11 +02:00
Rainer Gerhards
b68310e15f
maintain ChangeLog
2014-10-07 11:56:01 +02:00
Henri Lakk
8a5bfe4846
bugfix rsgtutil: deletion of logs at end of file was not reported
...
The verification function in rsgtutil tool did not report deletion of
whole signed blocks of lines from the end of the log file.
2014-10-07 11:55:36 +02:00
Rainer Gerhards
4def8d670b
Merge branch 'v8-stable'
2014-10-06 14:49:24 +02:00
Rainer Gerhards
5a16a2a3d9
Merge branch 'v7-stable' into v8-stable
2014-10-06 14:49:17 +02:00
Rainer Gerhards
1ea89f227a
remove zpipe (a testing tool) from --enable-diagtools
...
This tool is no longer maintained and currently not used inside the
testbench. We keep it in the source tree for the time being in case that
it may be used in the future.
2014-10-06 14:49:00 +02:00
Rainer Gerhards
e5c152eb44
Merge remote-tracking branch 'github/master'
...
Conflicts:
ChangeLog
2014-10-06 10:51:48 +02:00
Rainer Gerhards
3d2dcb5623
Merge branch 'v8-stable'
...
Conflicts:
ChangeLog
configure.ac
2014-10-06 10:50:30 +02:00
Rainer Gerhards
4f1ef74ef7
Merge branch 'v7-stable' into v8-stable
...
Conflicts:
ChangeLog
2014-10-06 10:46:46 +02:00
Rainer Gerhards
934dab0ed9
rsgtutil: avoid emitting unnecessary error messages
2014-10-06 10:44:28 +02:00
Rainer Gerhards
61a25cc2a8
bugfix: rsgtutil sometimes crashed in verify mode if file did not exist
2014-10-06 10:41:19 +02:00
Rainer Gerhards
98c1451d2f
Merge branch 'v8-stable'
...
Conflicts:
ChangeLog
configure.ac
2014-10-02 12:46:23 +02:00
Rainer Gerhards
e6f6425a55
maintain ChangeLog
v8.4.2
2014-10-02 12:28:27 +02:00
Rainer Gerhards
04487fceae
Merge branch 'v7-stable' into v8-stable
2014-10-02 12:27:30 +02:00
Olaf
aa4ba15c61
fix build problem on some platforms
v7.6.7
2014-10-02 12:17:34 +02:00
Rainer Gerhards
c374cce103
Merge branch 'v7-stable' into v8-stable
...
Conflicts:
ChangeLog
configure.ac
2014-10-02 08:13:49 +02:00
Rainer Gerhards
910636cf3c
prepare for 7.6.7
2014-10-02 07:53:55 +02:00
Rainer Gerhards
4ee5c78498
testbench: add invalid facility tests
2014-10-01 12:27:29 +02:00
Rainer Gerhards
bf8e0f291d
parser: do not unnecessarily parse invalid PRI
...
abort as soon as we know its too high
2014-10-01 12:18:36 +02:00
Rainer Gerhards
3755b21992
do not try to parse messages with invalid facility (RFC3164 mode)
2014-10-01 11:41:09 +02:00
Rainer Gerhards
57fd944683
cleanup: remove comment that no longer applies
2014-10-01 11:18:08 +02:00
Rainer Gerhards
5038d00c8e
invalid facilities: include full rawmsg in MSG property
...
Based on RFC3164 definitions, this makes a lot of sense. Thanks to
mancha for suggesting this behaviour.
2014-10-01 10:55:24 +02:00