Merge branch '2.1' into 2.2

2017-12-29 08:42:49 +02:00
parent da77b0419c b543f37a11
commit 8b2aa52384
13 changed files with 207 additions and 5 deletions
--- a/server/core/utils.cc
+++ b/server/core/utils.cc
@ -590,7 +590,7 @@ static pcre2_code* remove_comments_re = NULL;
 static const PCRE2_SPTR remove_comments_pattern = (PCRE2_SPTR)
                                                  "(?:`[^`]*`\\K)|"
                                                  "(\\/[*](?!(M?!)).*?[*]\\/)|"
-                                                  "([[:space:]](?:#.*|--[[:space:]].*(\\n|\\r\\n)))";
+                                                  "((?:#.*|--[[:space:]].*)(\\n|\\r\\n|$))";

 /**
 * Remove SQL comments from the end of a string