Merge branch '2.1' into 2.2

2017-12-12 13:23:02 +02:00
parent 6485365b3b 7ebd487ef3
commit 79afaa447e
97 changed files with 5945 additions and 361 deletions
--- a/server/core/utils.cc
+++ b/server/core/utils.cc
@ -588,7 +588,9 @@ strip_escape_chars(char* val)
 #define BUFFER_GROWTH_RATE 2.0
 static pcre2_code* remove_comments_re = NULL;
 static const PCRE2_SPTR remove_comments_pattern = (PCRE2_SPTR)
-                                                  "(?:`[^`]*`\\K)|(\\/[*](?!(M?!)).*?[*]\\/)|(?:#.*|--[[:space:]].*)";
+                                                  "(?:`[^`]*`\\K)|"
+                                                  "(\\/[*](?!(M?!)).*?[*]\\/)|"
+                                                  "([[:space:]](?:#.*|--[[:space:]].*(\\n|\\r\\n)))";

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