aboutsummaryrefslogtreecommitdiffstats
path: root/perl
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rambler-co.ru>2010-07-31 18:59:40 +0400
committerVsevolod Stakhov <vsevolod@rambler-co.ru>2010-07-31 18:59:40 +0400
commit2a8b8ce671babd92cd60fbd70be9edf97cc20603 (patch)
treefe4c61979cd646544d5e2be1e89c8c8d9241e3af /perl
parent7c778294a9625ee4954f784763495e05af513510 (diff)
downloadrspamd-2a8b8ce671babd92cd60fbd70be9edf97cc20603.tar.gz
rspamd-2a8b8ce671babd92cd60fbd70be9edf97cc20603.zip
* Write symbols weights to rspamc output
* Improve logic of selecting rspamc version * Do not try to parse broken DNS replies * Add 'raw' flag to FROM_EXCESS_BASE64 rule (requested by citrin)
Diffstat (limited to 'perl')
-rw-r--r--perl/lib/Mail/Rspamd/Client.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl/lib/Mail/Rspamd/Client.pm b/perl/lib/Mail/Rspamd/Client.pm
index 789b3187d..4af7a02d9 100644
--- a/perl/lib/Mail/Rspamd/Client.pm
+++ b/perl/lib/Mail/Rspamd/Client.pm
@@ -35,7 +35,7 @@ $VERSION = "1.02";
my $EOL = "\015\012";
my $BLANK = $EOL x 2;
-my $PROTOVERSION = 'RSPAMC/1.0';
+my $PROTOVERSION = 'RSPAMC/1.2';
=head1 PUBLIC METHODS
@@ -953,14 +953,16 @@ sub _do_rspamc_command {
}
else {
foreach my $line (@lines) {
- if ($line =~ m!Metric: (\S+); (\S+); (\S+) / (\S+)!) {
+ if ($line =~ m!Metric: (\S+); (\S+); (\S+) / (\S+) (/ (\S+))?!) {
$metrics{$1} = {
isspam => $2,
score => $3 + 0,
threshold => $4 + 0,
+ reject_score => $6,
symbols => [],
urls => [],
messages => [],
+ action => 'no action',
};
$cur_metric = $1;
}