diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 07:48:27 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 07:48:27 +0200 |
| commit | 83de403d50bc2b1ca8a690f969434c7ea7b9df2c (patch) | |
| tree | 8a6a6aa6276ba7487de9b35b4abd4c59d947a859 | |
| parent | df90450d962b79fb59897fd9d2bd21292277256e (diff) | |
| parent | 5ac39a620787ea995b0029a9d01598074f84b717 (diff) | |
| download | rsyslog-83de403d50bc2b1ca8a690f969434c7ea7b9df2c.tar.gz rsyslog-83de403d50bc2b1ca8a690f969434c7ea7b9df2c.tar.xz rsyslog-83de403d50bc2b1ca8a690f969434c7ea7b9df2c.zip | |
Merge branch 'v6-stable' into beta
| -rw-r--r-- | .gitignore | 15 | ||||
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | doc/Makefile.am | 15 | ||||
| -rw-r--r-- | grammar/lexer.l | 1 |
4 files changed, 32 insertions, 0 deletions
@@ -40,3 +40,18 @@ debug core.* shave shave-libtool +core* +vgcore* +*.tar.gz +*.new +*.orig +*.old +*.diff +*.patch +checklog +*.bad +*.rej +*.log +logfile* +*.conf +log @@ -139,6 +139,7 @@ Version 6.5.0 [devel] 2012-08-28 http://bugzilla.adiscon.com/show_bug.cgi?id=353 --------------------------------------------------------------------------- Version 6.4.3 [V6-STABLE] 2012-??-?? +- bugfix: comments inside objects (e.g. action()) were not properly handled - bugfix: sysklogd-emulating standard template was no longer present in v6 This was obviously lost during the transition to the new config format. Thanks to Milan Bartos for alerting us and a patch! diff --git a/doc/Makefile.am b/doc/Makefile.am index cc1a3209..1ae1c68d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -130,6 +130,21 @@ html_files = \ rsyslog_conf_nomatch.html \ queues_analogy.html \ multi_ruleset.html \ + dev_oplugins.html \ + free_support.html \ + imudp.html \ + messageparser.html \ + omhdfs.html \ + omprog.html \ + queue_msg_state.jpeg \ + rsconf1_abortonuncleanconfig.html \ + rsconf1_maxopenfiles.html \ + rsconf1_omfileforcechown.html \ + rsyslog_conf_file_syntax_differences.html \ + rsyslog_conf_lines.html \ + rsyslog_queue_pointers.jpeg \ + rsyslog_queue_pointers2.jpeg \ + v6compatibility.html \ src/classes.dia grfx_files = \ diff --git a/grammar/lexer.l b/grammar/lexer.l index 76b1298c..ce7c34c5 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -211,6 +211,7 @@ int fileno(FILE *stream); /*yylval.estr = es_newStrFromBuf(yytext+1, yyleng-2); return VALUE; }*/ "/*" { preCommentState = YY_START; BEGIN COMMENT; } +<INOBJ>"/*" { preCommentState = YY_START; BEGIN COMMENT; } <EXPR>"/*" { preCommentState = YY_START; BEGIN COMMENT; } <COMMENT>"*/" { BEGIN preCommentState; } <COMMENT>([^*]|\n)+|. |