You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/07/26 09:20:57 UTC
svn commit: r1863788 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Util.pm
trunk/lib/Mail/SpamAssassin/Util.pm
Author: hege
Date: Fri Jul 26 09:20:57 2019
New Revision: 1863788
URL: http://svn.apache.org/viewvc?rev=1863788&view=rev
Log:
Bug 6802 - force regex ascii semantics
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm?rev=1863788&r1=1863787&r2=1863788&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm Fri Jul 26 09:20:57 2019
@@ -1830,7 +1830,9 @@ sub compile_regexp {
die "$_[0]\n";
}
};
- $compiled_re = qr/$re/; 1;
+ # Bug 6802 - force ascii semantics with /aa
+ $compiled_re = $] >= 5.014000 ? qr/$re/aa : qr/$re/;
+ 1;
};
if ($ok && ref($compiled_re) eq 'Regexp') {
#$origre = untaint_var($origre);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1863788&r1=1863787&r2=1863788&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Fri Jul 26 09:20:57 2019
@@ -1952,7 +1952,9 @@ sub compile_regexp {
die "$_[0]\n";
}
};
- $compiled_re = qr/$re/; 1;
+ # Bug 6802 - force ascii semantics with /aa
+ $compiled_re = $] >= 5.014000 ? qr/$re/aa : qr/$re/;
+ 1;
};
if ($ok && ref($compiled_re) eq 'Regexp') {
#$origre = untaint_var($origre);