Merge branch '2.2' into develop

2018-03-01 18:08:45 +02:00
parent a197e6c859 544e0eb60b
commit ea83420620
18 changed files with 330 additions and 117 deletions
--- a/server/modules/filter/dbfwfilter/token.l
+++ b/server/modules/filter/dbfwfilter/token.l
@ -35,7 +35,7 @@ USTR        [%-_[:alnum:][:punct:]]+
 CMP         [=<>!]+

 %%
-"\n"+           return '\n';
+{SPACE}"\n"+    return '\n';
 {COMMENT}       return FWTOK_COMMENT;
 deny|allow      MXS_WARNING("Use of '%s' is deprecated, use 'match' instead", yytext);return FWTOK_MATCH;
 rule            return FWTOK_RULE;