* Use ungreedy match to strip trailing whitespaces

diff --git a/perl/lib/Mail/Rspamd/Client.pm b/perl/lib/Mail/Rspamd/Client.pm
index 7f32cd6ee937e07ac6231f7d03f05a4027fce6cd..eb92cada43c6ce9518a3e5bbbd51d946fa898166 100644 (file)
--- 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}$/) {