Merge remote-tracking branch 'upstream/master'

Conflicts: CONTRIBUTORS Makefile lib/logstash/outputs/elasticsearch_http.rb lib/logstash/outputs/sns.rb test/logstash/outputs/sns_test.rb test/test_helper.rb
ttyard · May 22, 2012 · 6644013 · 6644013
2 parents 91d79a3 + f8859a7
commit 6644013
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
diff --git a/Makefile b/Makefile
diff --git a/patterns/grok-patterns b/patterns/grok-patterns
@@ -12,8 +12,7 @@ NOTSPACE \S+
 SPACE \s*
 DATA .*?
 GREEDYDATA .*
-#QUOTEDSTRING (?:(?<!\\)(?:"(?:\\.|[^\\"])*"|(?:'(?:\\.|[^\\'])*')|(?:`(?:\\.|[^\\`])*`)))
-QUOTEDSTRING (?:(?<!\\)(?:"(?:\\.|[^\\"]+)*"|(?:'(?:\\.|[^\\']+)*')|(?:`(?:\\.|[^\\`]+)*`)))
+QUOTEDSTRING (?:(?<!\\)(?:"(?>[^\\"]+|\\.)*")|(?:'(?>[^\\']+|\\.)*')|(?:`(?>[^\\`]+|\\.)*`))
 
 # Networking
 MAC (?:%{CISCOMAC}|%{WINDOWSMAC}|%{COMMONMAC})