summaryrefslogtreecommitdiffstats
path: root/grammar
Commit message (Collapse)AuthorAgeFilesLines
* Make use of int64 json numbers, if availablePavel Levshin2013-10-261-0/+4
|
* Merge branch 'v7-stable'Rainer Gerhards2013-10-261-0/+1
|\
| * bugfix: memory leak in strlen() RainerScript functionRainer Gerhards2013-10-251-0/+1
| | | | | | | | | | Thanks to Gregoire Seux for reportig this bug. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=486
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-251-2/+3
|\|
| * bugfix: buffer overrun if re_extract function was called for submatch 50Rainer Gerhards2013-10-251-1/+1
| | | | | | | | Thanks to Pavel Levshin for reporting the problem and its location.
| * bugfix: memleak in re_extract() functionRainer Gerhards2013-10-251-1/+2
| | | | | | | | Thanks to Pavel Levshin for reporting this problem.
* | re-enable global vars, but as an undocumented & unsupported featureRainer Gerhards2013-10-231-1/+1
| | | | | | | | This is done as we may be able to preserve the syntax.
* | remove global variable supportRainer Gerhards2013-10-221-2/+2
| | | | | | | | | | | | | | | | The original idea was not well thought out and global variables, as implemented, worked far different from what anybody would expect. As such, we consider the current approach as an experiment that did not work out and opt to removing it, clearing the way for a better future solution. Note: global vars were introduced in 7.5.3 on Sept, 11th 2013.
* | refactor config property filter decoding and fix some memleaksRainer Gerhards2013-10-181-15/+19
| | | | | | | | | | all leaks are cosmetic, happen only once during startup and in error cases. Do not affect performance at all (but valgrind testing ;)).
* | fix cosmetic memleak when property filter is disabledRainer Gerhards2013-10-181-0/+1
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-181-2/+4
|\| | | | | | | | | Conflicts: runtime/conf.c
| * bugfix: invalid property filter was not properly disabled in rulesetRainer Gerhards2013-10-181-2/+3
| | | | | | | | | | | | | | | | 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-181-0/+106
| | | | | | | | among others, provides *much* better error messages to user
* | remove unused variablesRainer Gerhards2013-10-181-2/+0
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-10-181-1/+4
|\|
| * bugfix: segfault if re_extract() function was used and no match foundRainer Gerhards2013-10-181-1/+4
| |
* | Merge branch 'master-lookup'Rainer Gerhards2013-10-133-1/+56
|\ \ | | | | | | | | | | | | | | | Conflicts: grammar/rainerscript.h runtime/rsyslog.h
| * | add base plumbing for (later) dynamic table reloadRainer Gerhards2013-07-161-2/+1
| | | | | | | | | | | | | | | among others, we change some internal interfaces. So far, we only add the necessary locks. More work in later commits.
| * | milestone: basic lookup() functionality is presentRainer Gerhards2013-07-102-1/+52
| | | | | | | | | | | | done the naive way, string indzes only
| * | Merge branch 'master' into master-lookupRainer Gerhards2013-07-091-49/+60
| |\ \
| * | | milestone: add lookup_table stmt to RainerScriptRainer Gerhards2013-07-092-0/+6
| | | | | | | | | | | | | | | | ... but still does nothing execpt calling the handler.
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-10-101-3/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | bugfix: array-based ==/!= comparisions lead to invalid resultsRainer Gerhards2013-10-101-3/+4
| | | | | | | | | | | | | | | | This was a regression introduced in 7.3.5 bei the PRI optimizer
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-08-261-1/+1
|\| | |
| * | | bugfix: imtcp addtlframedelimiter could not be set to zeroRainer Gerhards2013-08-261-1/+1
| | | | | | | | | | | | | | | | Thanks to Chris Norton for alerting us.
| * | | fix regression that caused freeInstance not to be correctly calledRainer Gerhards2013-07-152-2/+2
| | | | | | | | | | | | | | | | was introduced July, 5th 2013 by commit 8ee2b0b1610fbf4dff20453d188f379583410b42
* | | | first shot at global variables (without proper sync so far)Rainer Gerhards2013-07-221-1/+1
| | | |
* | | | Merge branch 'master-localvars'Rainer Gerhards2013-07-201-1/+1
|\ \ \ \
| * | | | milestone: basic local variable functionality availableRainer Gerhards2013-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | but some nits, like do not work with disk queues
* | | | | main_queue() config object addedRainer Gerhards2013-07-192-0/+6
|/ / / / | | | | | | | | | | | | doc still missing
* | | | fix regression that caused freeInstance not to be correctly calledRainer Gerhards2013-07-152-2/+2
| | | | | | | | | | | | | | | | was introduced July, 5th 2013 by commit 8ee2b0b1610fbf4dff20453d188f379583410b42
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-101-0/+2
|\| | | | |_|/ |/| |
| * | fix build on FreeBSDCristiano Rolim2013-07-101-0/+2
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-07-051-49/+60
|\| | | |/ |/|
| * bugfix: potential segfault during startup on invalid configRainer Gerhards2013-07-051-49/+60
| | | | | | | | | | could happen if invalid actions were present, which could lead to improper handling in optimizer.
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-241-2/+9
|\|
| * bugfix: RainerScript object required parameters were not properly checkedRainer Gerhards2013-06-241-2/+9
| | | | | | | | this clould result to segfaults on startup if parameters were missing.
* | cosmetic: update .gitignore filesRainer Gerhards2013-05-081-0/+1
|/
* Merge branch 'v7-stable'Rainer Gerhards2013-04-082-61/+127
|\ | | | | | | | | | | Conflicts: grammar/rainerscript.c runtime/ruleset.c
| * bugfix: nested if/prifilt conditions did not work properlyRainer Gerhards2013-04-042-61/+129
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=415
| * bugfix: script == comparison did not work properly on JSON objectsRainer Gerhards2013-04-041-0/+23
| | | | | | | | backport from 7.3 branch
* | add RainerScript re_extract() functionRainer Gerhards2013-03-272-2/+104
| |
* | Fix for glob(3)s that lack GLOB_NOMAGICMartin Carpenter2013-03-211-4/+8
| | | | | | | | | | | | Conflicts: configure.ac
* | Merge branch 'v7-stable' into tmpRainer Gerhards2013-03-201-1/+5
|\|
| * bugfix: RainerScript getenv() function caused segfault when var was not foundPhilippe Muller2013-03-201-1/+5
| | | | | | | | | | | | | | This patch is released under ASL 2.0 as of email conversation from 2013-03-20. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | bugfix: segfault in expression optimizerRainer Gerhards2013-03-151-4/+4
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=423
* | Merge branch 'v7-stable'Rainer Gerhards2013-03-132-3/+14
|\| | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * bugfix: include files got included in the wrong orderRainer Gerhards2013-02-282-3/+14
| | | | | | | | | | | | | | | | | | This happens if an $IncludeConfig directive was done on multiple files (e.g. the distro default of $IncludeConfig /etc/rsyslog.d/*.conf). In that case, the order of include file processing is reversed, which could lead to all sorts of problems. Thanks to Nathan Stratton Treadway for his great analysis of the problem, which made bug fixing really easy.
* | field() function now supports a string as field delimiterRainer Gerhards2013-02-101-7/+58
| | | | | | | | | | also done a bugfix: field() function did never return "***FIELD NOT FOUND***" instead it returned "***ERROR in field() FUNCTION***" in that case
* | bugfix: script == comparison did not work properly on JSON objectsRainer Gerhards2013-02-081-0/+23
| |