summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v7-stable'Rainer Gerhards2013-10-182-2/+11
|\ | | | | | | | | Conflicts: runtime/conf.c
| * bugfix: invalid property filter was not properly disabled in rulesetRainer Gerhards2013-10-183-2/+10
| | | | | | | | | | | | | | | | Note that this bugfix introduces a very slight memory leak, which is cosmetic, as it just holds data until termination that is no longer needed. It is just the part of the config that was invalid. We will "fix" this "issue" in the devel version first, as the fix is a bit too intrusive to do without hard need in the stable version.
* | refactor property-based filter decodingRainer Gerhards2013-10-183-105/+106
| | | | | | | | among others, provides *much* better error messages to user
* | slight optimizations: avoid unnecessary writesRainer Gerhards2013-10-181-2/+4
| | | | | | | | but this happens only during config load, so no real gain
* | doc: mention bugfix in ChangeLogRainer Gerhards2013-10-181-0/+3
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-181-0/+3
|\|
| * doc: add last bugfix to ChangeLogRainer Gerhards2013-10-181-0/+3
| |
| * bugfix: potential misadressing when trimming cstr'sRainer Gerhards2013-10-181-1/+1
| |
* | include invalid property name in property filter error messageRainer Gerhards2013-10-181-4/+4
| |
* | remove obsolete functionRainer Gerhards2013-10-182-21/+0
| |
* | bugfix: potential misadressing when trimming cstr'sRainer Gerhards2013-10-181-1/+1
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-180-0/+0
|\| | | | | | | | | Conflicts: runtime/libgcry.h
| * remove compiler warningRainer Gerhards2013-10-181-2/+2
| |
| * add missing function prototypeRainer Gerhards2013-10-181-0/+1
| |
| * cosmetic: remove compiler warningsRainer Gerhards2013-10-181-3/+4
| |
* | cosmetic: remove compiler warningsRainer Gerhards2013-10-181-3/+4
| |
* | remove unused variablesRainer Gerhards2013-10-181-2/+0
| |
* | remove compiler warningRainer Gerhards2013-10-181-2/+2
| |
* | remove no longer needed variableRainer Gerhards2013-10-181-1/+0
| |
* | bugfix: omelasticsearch did not compile on platforms without atomic instructionsRainer Gerhards2013-10-182-5/+7
| |
* | doc: mention imported bugfixRainer Gerhards2013-10-181-0/+3
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-182-1/+5
|\|
| * bugfix: segfault if re_extract() function was used and no match foundRainer Gerhards2013-10-182-1/+5
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-171-2/+2
|\|
| * doc: typo fixRainer Gerhards2013-10-171-2/+2
| | | | | | | | thanks to Xuri Nagarin for alerting us
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-162-3/+4
|\|
| * bugfix: omelasticsearch: failed.es counter was only maintained in bulk modeRainer Gerhards2013-10-162-3/+4
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-162-5/+24
|\| | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c
| * bugfix: omelasticsearch: did not correctly initialize stats countersRainer Gerhards2013-10-162-1/+10
| | | | | | | | | | | | | | | | This usually did not lead to any problems, because they are in static memory, which is initialized to zero by the OS when the plugin is loaded. But it may cause problems especially on systems that do not support atomic instructions - in this case the associated mutexes also did not get properly initialized.
| * omelasticsearch: add failed.httprequests stats counterRainer Gerhards2013-10-162-0/+7
| |
| * bugfix omelasticsearch: failed.http stats counter had incorrect countRainer Gerhards2013-10-161-5/+8
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-162-2/+2
|\|
| * require libestr 0.1.8, as there are bugs in previous versions that affect usRainer Gerhards2013-10-162-2/+2
| |
* | nit: fixing 7.5.5 release datev7.5.5Rainer Gerhards2013-10-161-1/+1
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-161-0/+1
|\|
| * doc: add new helpful link to impstats docRainer Gerhards2013-10-161-0/+1
| |
* | Merge branch 'c10'Rainer Gerhards2013-10-162-0/+90
|\ \ | | | | | | | | | | | | | | | Conflicts: configure.ac doc/rsyslog_conf_modules.html
| * | doc: linking between mmrfc5424addhmac resourcesRainer Gerhards2013-10-162-0/+8
| | |
| * | Merge branch 'c10-neu' into c10Rainer Gerhards2013-10-161-87/+24
| |\ \ | | | | | | | | | | | | | | | | Conflicts: doc/mmrfc5424addhmac.html
| | * | doc: describe mmrfc5424addhmac parametersRainer Gerhards2013-10-161-87/+17
| | | |
| * | | doc: describe mmrfc5424addhmac log verification methodRainer Gerhards2013-10-161-1/+27
| |/ /
| * | doc: add base doc for mmrfc5424addhmacRainer Gerhards2013-10-151-0/+119
| | | | | | | | | | | | | | | while it probably is not of general interest, at least some rough facts are conveyed.
| * | change version number to reflect custom branchRainer Gerhards2013-09-261-1/+1
| | |
* | | turn off accidentally enabled make check debug modeRainer Gerhards2013-10-151-1/+1
| | |
* | | bugfix: imfile did not properly initialize strm object ptrRainer Gerhards2013-10-155-4/+29
| | | | | | | | | | | | | | | | | | 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.
* | | mmutf8fix: compile problem & potential misadressing at end of messageRainer Gerhards2013-10-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | this is a regression of a recently-done bugfix, which I unfortunately did not test correctly (accidently, compilation for this module was not enabled). Thanks to Risto Vaarandi for alerting me.
* | | imfile: permit to monitor an unlimited number of filesRainer Gerhards2013-10-142-26/+52
| | |
* | | imfile: improve config file parameter validationRainer Gerhards2013-10-141-0/+66
| | |
* | | cleanup: remove some code that stems back to the module sample codeRainer Gerhards2013-10-141-30/+2
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-10-142-1/+13
|\ \ \ | | |/ | |/|