summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4-beta' into betaRainer Gerhards2009-09-102-3/+15
|\ | | | | | | | | Conflicts: action.c
| * bugfix: repeated messages were incorrectly processedRainer Gerhards2009-09-102-3/+15
| | | | | | | | | | | | | | | | | | this could lead to loss of the repeated message content. As a side- effect, it could probably also be possible that some segfault occurs (quite unlikely). The root cause was that some counters introduced during the malloc optimizations were not properly duplicated in MsgDup(). Note that repeated message processing is not enabled by default.
| * minor: optimized dbgprintf() useRainer Gerhards2009-09-101-17/+17
| |
* | minor: optimized dbgprintf() calling sequenceRainer Gerhards2009-09-101-17/+17
| |
* | Merge branch 'v4-beta' into betaRainer Gerhards2009-09-042-4/+9
|\|
| * Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-09-042-4/+9
| |\
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-09-0412-26/+26
| | |\ | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf.html
| | | * clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers]Rainer Gerhards2009-09-042-3/+7
| | | | | | | | | | | | | | | | in doc set (require TLS drivers)
* | | | Merge branch 'v4-devel' into betaRainer Gerhards2009-09-034-3/+60
|\ \ \ \
| * | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-09-034-3/+60
| |\| | |
| | * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-09-034-3/+60
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * | bugfix: reverse lookup reduction logic in imudp do DNS queries too oftenRainer Gerhards2009-09-034-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A comparison was done between the current and the former source address. However, this was done on the full sockaddr_storage structure and not on the host address only. This has now been changed for IPv4 and IPv6. The end result of this bug could be a higher UDP message loss rate than necessary (note that UDP message loss can not totally be avoided due to the UDP spec)
| | | * | preparing for 4.4.1 releasev4.4.1Rainer Gerhards2009-09-023-3/+3
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2009-08-273-4/+40
|\ \ \ \ \
| * | | | | Merge branch 'v4-devel' into betaRainer Gerhards2009-08-273-4/+40
| |\| | | |
| | * | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-08-271-0/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-08-274-3/+29
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/msg.c
| | | | * | bugfix (backport): omfwd segfaultRainer Gerhards2009-08-272-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the orginal (higher version) patch states this happens only when debugging mode is turned on. That statement is wrong: if debug mode is turned off, the message is not being emitted, but the division by zero in the actual parameters still happens.
| | * | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-08-263-4/+35
| | |\| | |
| | | * | | bugfix: message sanitation had some issuesRainer Gerhards2009-08-263-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - control character DEL was not properly escaped - NUL and LF characters were not properly stripped if no control character replacement was to be done - NUL characters in the message body were silently dropped (this was a regeression introduced by some of the recent optimizations)
| | | * | | very minor fix: removing invalid doc left-over from mergeRainer Gerhards2009-08-261-9/+0
| | | | | |
* | | | | | reduced number of debug messages a bit againRainer Gerhards2009-08-264-15/+0
| | | | | |
* | | | | | Merge branch 'beta'Rainer Gerhards2009-08-263-1/+22
|\| | | | |
| * | | | | Merge branch 'v4-devel' into betaRainer Gerhards2009-08-254-12/+24
| |\| | | |
| | * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2009-08-254-12/+24
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | | | | | | Conflicts: ChangeLog runtime/msg.c
| | | * | bugfix: invalid double-quoted PRI, among others in outgoing messagesRainer Gerhards2009-08-252-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | This causes grief with all receivers. Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=147
| | | * | features requiring Java are automatically disabled if Java is not presentRainer Gerhards2009-08-253-1/+13
| | | | | | | | | | | | | | | | | | | | (thanks to Michael Biebl for his help!)
| | | * | bugfix: Java testing tools were required, even if testbench was disabledRainer Gerhards2009-08-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resulted in build errors if no Java was present on the build system, even though none of the selected option actually required Java. (I forgot to backport a similar fix to newer releases).
* | | | | minor update to rsyslog/syslog-ng comparisonRainer Gerhards2009-08-211-2/+7
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2009-08-211-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | Merge branch 'v4-devel' into betaRainer Gerhards2009-08-212-1/+6
| |\| | |
| | * | | bugfix: strings improperly reused [backported from v5]Rainer Gerhards2009-08-212-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | ... resulting in some message properties be populated with strings from previous messages. This was caused by an improper predicate check.
* | | | | bugfix: strings improperly reusedRainer Gerhards2009-08-212-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | ... resulting in some message properties be populated with strings from previous messages. This was caused by an improper predicate check.
* | | | | updating project status to reflect new releasesRainer Gerhards2009-08-211-9/+11
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2009-08-211-13/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | Merge branch 'v4-devel' into betaRainer Gerhards2009-08-213-9/+13
| |\| | |
| | * | | preparing for 4.5.2v4.5.2Rainer Gerhards2009-08-213-3/+3
| | | | |
| | * | | Merge branch 'v4-devel' into v4-betaRainer Gerhards2009-08-2130-360/+698
| | |\ \ \
| | * \ \ \ Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-08-211-6/+10
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * | | Merge branch 'v4.3.2' (v4-beta) into v4-stablev4.4.0Rainer Gerhards2009-08-21150-1197/+6895
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am
| | | * | | | fixed left-over from merge failureRainer Gerhards2009-07-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | thanks to Michael Biebl for pointing the problem out
| | | * | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-07-134-6/+10
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | | | | | | added forgotten testcaseRainer Gerhards2009-08-202-0/+5
| | | | | | | |
* | | | | | | | Merge branch 'beta'Rainer Gerhards2009-08-201-0/+3
|\| | | | | | |
| * | | | | | | Merge branch 'v4-devel' into betaRainer Gerhards2009-08-202-1/+4
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | bugfix: hostnames with dashes in them were incorrectly treated as malformedRainer Gerhards2009-08-202-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... thus causing them to be treated as TAG (this was a regression introduced from the "rfc3164 strict" change in 4.5.0).
* | | | | | | | bugfix: hostnames with dashes in them were incorrectly treated as malformedRainer Gerhards2009-08-204-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... thus causing them to be treated as TAG (this was a regression introduced from the "rfc3164 strict" change in 4.5.0). Testbench has been updated to include a smaple message with a hostname containing a dash.
* | | | | | | | added new config option $ActionWriteAllMarkMessagesRainer Gerhards2009-08-204-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this option permites to process mark messages under all circumstances, even if an action was recently called. This can be useful to use mark messages as a kind of heartbeat.
* | | | | | | | preparing for 5.1.4 releasev5.1.4Rainer Gerhards2009-08-203-3/+14
| | | | | | | |
* | | | | | | | added important bug fix doc to current releaseRainer Gerhards2009-08-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the bug fix was imported from 4.5.1, but it is important enough to be highlighted in its own right.