Ignore Windows new-lines.

Fixes #3292

diff --git a/lib/config/config_lexer.cc b/lib/config/config_lexer.cc
index d0b6ff9a66e1a5929233ad99f0ff6e40d1d09ccf..e8b32b89870db2e4b5c986484b4c28786b7e57cf 100644 (file)
--- a/lib/config/config_lexer.cc
+++ b/lib/config/config_lexer.cc
@@ -394,7 +394,7 @@ static yyconst flex_int16_t yy_accept[78] =
 static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    2,    1,    4,    5,    1,    1,    1,    1,    1,
         1,    6,    7,    1,    8,    9,   10,   11,   11,   11,

diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll
index 619e3cb8767931550c7acddffd200237a2ada48c..b0931bba0d553bfc6bf4b0d855920e0f60606ff3 100644 (file)
--- a/lib/config/config_lexer.ll
+++ b/lib/config/config_lexer.ll
@@ -76,7 +76,7 @@ null                          return T_NULL;
 }
 
 \/\/[^\n]+                     /* ignore C++-style comments */
-[ \t\n]+                       /* ignore whitespace */
+[ \t\r\n]+                     /* ignore whitespace */
 
 .                              return yytext[0];
 %%