From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 2 Dec 2015 13:40:37 +0000 (+0000)
Subject: Match any newline character in regexps
X-Git-Tag: 1.1.0~431
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09c3e1b85633c1541555b1fdd74f814b2a0ff930;p=thirdparty%2Frspamd.git

Match any newline character in regexps

Issue: #438
Reported by: @moisseev
---

diff --git a/src/libutil/regexp.c b/src/libutil/regexp.c
index 2bf21ca1e6..2ddfa694d0 100644
--- a/src/libutil/regexp.c
+++ b/src/libutil/regexp.c
@@ -179,6 +179,8 @@ rspamd_regexp_new (const gchar *pattern, const gchar *flags,
 	}
 
 	rspamd_flags |= RSPAMD_REGEXP_FLAG_RAW;
+
+	regexp_flags |= PCRE_NEWLINE_ANYCRLF;
 	regexp_flags &= ~PCRE_UTF8;
 
 	if (flags_str != NULL) {
@@ -389,6 +391,7 @@ rspamd_regexp_search (rspamd_regexp_t *re, const gchar *text, gsize len,
 	}
 
 	match_flags = PCRE_NEWLINE_ANYCRLF;
+
 	if ((re->flags & RSPAMD_REGEXP_FLAG_RAW) || raw) {
 		r = re->raw_re;
 		ext = re->raw_extra;