summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-272-3/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-272-3/+15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-272-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-216-9/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-213-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html
| * | | | | | | bugfix (kind of): removed numerical part from pri-textRainer Gerhards2011-10-214-27/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see v6 compatibility document for reasons
* | | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-10-2111-19/+42
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-219-16/+30
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| | * | | | | | preparing for 5.8.6 releasev5.8.6Rainer Gerhards2011-10-213-3/+3
| | | | | | | |
| | * | | | | | bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-215-6/+18
| | | | | | | |
| | * | | | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2011-10-212-5/+5
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-202-5/+5
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | doc bugfix: pri-text neees to be fixed in an article as wellRainer Gerhards2011-10-201-3/+3
| | | | | | | |
| | | | * | | | doc bug: property pri-text was incorrectly describedRainer Gerhards2011-10-201-2/+2
| | | | | | | |
| | * | | | | | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
| | |/ / / / /
| | * | | | | bugfix: $OMFileFlushInterval period was doubled - now using correct valueRainer Gerhards2011-10-182-1/+2
| | | | | | |
| * | | | | | removed dependency on gcrypt for recently-enough GnuTLSRainer Gerhards2011-10-173-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | see: http://bugzilla.adiscon.com/show_bug.cgi?id=289
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-177-26/+82
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | | | Merge branch 'beta'Rainer Gerhards2011-10-177-38/+103
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-173-10/+17
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-171-0/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | doc: clarified that imklog does not support SolarisRainer Gerhards2011-10-171-0/+2
| | | | | | |
| | * | | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2011-10-173-9/+54
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | | | doc: mention imported bugfix in ChangeLogRainer Gerhards2011-10-131-0/+2
| | | | | | | |
| | | * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-132-1/+2
| | | |\| | | |
| | | | * | | | bugfix: $ActionExecOnlyOnce interval did not work properlyTomas Heinrich2011-10-132-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | | bugfix: ActionQueue could malfunction due to index errorVlad Grigorescu2011-10-172-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-135-16/+69
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | bugfix: race condition when extracting structured data and PROCIDRainer Gerhards2011-10-132-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME
| | * | | | | | bugfix: race condition when extracting program name and APPNAMERainer Gerhards2011-10-132-5/+27
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names
| | * | | | | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-073-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas.
| | * | | | | fixed compiler warnings in tcpflood.cRainer Gerhards2011-10-061-2/+3
| | | | | | |
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-266-16/+73
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | | | | | added support for v6 config system to omfwdRainer Gerhards2011-10-116-76/+244
| | | | | | |
* | | | | | | bugfix: facility local<x> was not correctly interpreted in legacy filtersRainer Gerhards2011-09-282-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was only accepted if it was the first PRI in a multi-filter PRI. Thanks to forum user Mark for bringing this to our attention.
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-269-19/+102
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-263-22/+52
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tools/omfile.c tools/ompipe.c
| | * | | | | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-263-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
| | * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-09-223-6/+40
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: this merge has problems, to be fixed with follow-up commits If file creation fails due to out of memory, we can enter a tight loop. Conflicts: ChangeLog configure.ac doc/manual.html runtime/parser.c runtime/rsyslog.h tests/Makefile.am tests/tcpflood.c
| | | * | | | bugfix: potential abort if ultra-large file io buffers are used andRainer Gerhards2011-09-202-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynafile cache exhausts address space (primarily a problem on 32 bit platforms)
| | | * | | | Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stableRainer Gerhards2011-09-15101-381/+5139
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0Rainer Gerhards2011-09-07101-381/+5139
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no changes compared to 4.7.5, just a re-release with the new version number as new v4-stable. The most important new feature is Solaris support. Conflicts: configure.ac doc/manual.html
| | | | | * | | | preparing for 4.7.5 releasev4.7.5Rainer Gerhards2011-08-313-3/+3
| | | | | | | | |
| | | * | | | | | typo fixAndrew Stothard2011-09-152-2/+2
| | | |/ / / / /
| | | * | | | | preparing for 4.6.8 releasev4.6.8Rainer Gerhards2011-08-312-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-073-6/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
| | * | | | | | bugfix: imuxsock did no longer ignore message-provided timestamp,Rainer Gerhards2011-09-072-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if so configured (the *default*). Lead to no longer sub-second timestamps. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281
| | * | | | | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-052-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | | preparing for 5.8.5 releasev5.8.5Rainer Gerhards2011-08-312-2/+2
| | | | | | | |
| * | | | | | | preparing for 5.9.3 releasev5.9.3Rainer Gerhards2011-08-312-2/+2
| | | | | | | |