From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Tue, 20 Jul 2010 14:47:15 +0000 (+0400)
Subject: * Use ungreedy match to strip trailing whitespaces
X-Git-Tag: 0.3.1~24
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8321dee67dfcdc19bad7f740ada06f54b8b0b167;p=rspamd.git

* Use ungreedy match to strip trailing whitespaces
---

diff --git a/perl/lib/Mail/Rspamd/Client.pm b/perl/lib/Mail/Rspamd/Client.pm
index 7f32cd6ee..eb92cada4 100644
--- a/perl/lib/Mail/Rspamd/Client.pm
+++ b/perl/lib/Mail/Rspamd/Client.pm
@@ -964,23 +964,23 @@ sub _do_rspamc_command {
 				};
 				$cur_metric = $1;
 			}
-			elsif ($line =~ /^Symbol: (\S+);\s*(.+)\s*${EOL}$/ && $cur_metric) {
+			elsif ($line =~ /^Symbol: (\S+);\s*(.+?)\s*$/ && $cur_metric) {
 				# Line with parameters
 				my $symref = $metrics{$cur_metric}->{'symbols'};
 				push(@$symref, "$1($2)");
 			}
-			elsif ($line =~ /^Symbol: (\S+)\s*/ && $cur_metric) {
+			elsif ($line =~ /^Symbol: (\S+?)\s*$/ && $cur_metric) {
 				my $symref = $metrics{$cur_metric}->{'symbols'};
 				push(@$symref, $1);
 			}
-			elsif ($line =~ /^Urls: (.+)\s*$/ && $cur_metric) {
+			elsif ($line =~ /^Urls: (.+?)\s*$/ && $cur_metric) {
 				@{ $metrics{$cur_metric}->{'urls'} } = split /,\s+/, $1;
 			}
-			elsif ($line =~ /^Message: (.+)\s*$/ && $cur_metric) {
+			elsif ($line =~ /^Message: (.+?)\s*$/ && $cur_metric) {
 				my $symref = $metrics{$cur_metric}->{'messages'};
 				push(@$symref, $1);
 			}
-			elsif ($line =~ /^Action: (.+)\s*$/ && $cur_metric) {
+			elsif ($line =~ /^Action: (.+?)\s*$/ && $cur_metric) {
 				$metrics{$cur_metric}->{'action'} = $1;
 			}
 			elsif ($line =~ /^${EOL}$/) {