svn commit: r577838 - /spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm

[mm...@apache.org]

Author: mmartinec
Date: Thu Sep 20 10:55:32 2007
New Revision: 577838

URL: http://svn.apache.org/viewvc?rev=577838&view=rev
Log:
Conf::Parser did not recognize module name with a digit as in "ifplugin Mail::SpamAssassin::Plugin::Razor2"; warn of syntax errors in failing eval

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=577838&r1=577837&r2=577838&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Thu Sep 20 10:55:32 2007
@@ -484,7 +484,7 @@
   my $eval = '';
   my $bad = 0;
   foreach my $token (@tokens) {
-    if ($token =~ /^\W+|[+-]?\d+(?:\.\d+)?$/) {
+    if ($token =~ /^\W+|^[+-]?\d+(?:\.\d+)?$/) {
       $eval .= untaint_var($token) . " ";
     }
     elsif ($token eq 'plugin') {
@@ -518,6 +518,7 @@
     # leave $skip_parsing as-is; we may not be parsing anyway in this block.
     # in other words, support nested 'if's and 'require_version's
   } else {
+    warn "config: error in $key - $eval: $@" if $@ ne '';
     $$skip_parsing_ref = 1;
   }
 }