summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | | Merge branch 'beta'Rainer Gerhards2009-08-193-10/+14
|\| | | | | |
| * | | | | | Merge branch 'v4-devel' into betaRainer Gerhards2009-08-192-2/+12
| |\| | | | |
| | * | | | | very minor cleanupRainer Gerhards2009-08-181-1/+0
| | | | | | |
| | * | | | | bugfix: potential segfault in output file writer (omfile)Rainer Gerhards2009-08-183-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In async write mode, we use modular arithmetic to index the output buffer array. However, the counter variables accidently were signed, thus resulting in negative indizes after integer overflow. That in turn could lead to segfaults, but was depending on the memory layout of the instance in question (which in turn depended on a number of variables, like compile settings but also configuration). The counters are now unsigned (as they always should have been) and so the dangling mis-indexing does no longer happen. This bug potentially affected all installations, even if only some may actually have seen a segfault.
| * | | | | | undid non-correct experimental fixRainer Gerhards2009-08-191-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found out that the previous segfault fix did not correct the root cause of the problem. Thus, I can re-instantiate the more performance- optimal logic. In the next step, I'll merge in the real fix, so do NOT use this commit as code you actually run!
* | | | | | | fixed compile problem introduced by mergeRainer Gerhards2009-08-181-0/+1
| | | | | | |
* | | | | | | Merge branch 'beta'Rainer Gerhards2009-08-186-19/+61
|\| | | | | |
| * | | | | | Merge branch 'v4-devel' into betaRainer Gerhards2009-08-186-22/+61
| |\ \ \ \ \ \
| | * | | | | | bugfix? (unconfirmed, testing): segfault when writing asynchronouslyRainer Gerhards2009-08-181-2/+8
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have undone a very small optimization with using pre-malloced memory, which seems to have some issues. Now I am doing mallocs and at least in test environment this seems to solve the issue. The code now needs more review. If it runs flawlessly for some time, I may try to re-enable to pre-malloc, but not necessarily: its performance benefit is very mild (aka: I don't think it justifies introducing bigger complexities).
| | * | | | | added $InputTCPMaxListeners directiveRainer Gerhards2009-08-175-17/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | permits to specify how many TCP servers shall be possible (default is 20).
| | * | | | | bugfix: if tcp listen port could not be created, no error message was emittedRainer Gerhards2009-08-173-4/+11
| | | | | | |
* | | | | | | Merge branch 'beta'Rainer Gerhards2009-08-173-22/+41
|\| | | | | |
| * | | | | | Merge branch 'v4-devel' into betaRainer Gerhards2009-08-173-22/+41
| |\| | | | |
| | * | | | | legacy syslog parser changed so that it now accepts date stamps in wrong case.Rainer Gerhards2009-08-173-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices seem to create them and I do not see any harm in supporting that.
* | | | | | | bugfix: discard action did not work (did not discard messages)Rainer Gerhards2009-07-306-23/+51
| | | | | | |
* | | | | | | bugfix: discard action caused segfaultRainer Gerhards2009-07-305-3/+40
| | | | | | |
* | | | | | | updated project statusRainer Gerhards2009-07-281-4/+4
| | | | | | |
* | | | | | | finishing touches for 5.1.3v5.1.3Rainer Gerhards2009-07-281-1/+1
| | | | | | |
* | | | | | | fixed testbench compile problem on some platformsRainer Gerhards2009-07-211-2/+1
| | | | | | |
* | | | | | | disabling new input termination interfaceRainer Gerhards2009-07-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a bug showed up during further testing. As this was a side-activity, I'll probably disable it for the time being and check what's going on somewhat later (I'll do it tomorrow if I can find it quickly)
* | | | | | | moved check_JAVA as suggested by Michael Biebl - thxRainer Gerhards2009-07-201-2/+2
| | | | | | |