You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2011/09/14 11:14:19 UTC

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

Author: mmartinec
Date: Wed Sep 14 09:14:19 2011
New Revision: 1170488

URL: http://svn.apache.org/viewvc?rev=1170488&view=rev
Log:
Bug 6657 - final touches

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1170488&r1=1170487&r2=1170488&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Sep 14 09:14:19 2011
@@ -2660,7 +2660,8 @@ name.
         # RFC 5322 section 3.6.8, ftext printable US-ASCII ch not including ":"
         if ($header_name !~ /\S/) {
 	  return $MISSING_REQUIRED_VALUE;
-        } elsif ($header_name !~ /^([!-9;-\176]+)$/) {
+      # } elsif ($header_name !~ /^([!-9;-\176]+)$/) {
+        } elsif ($header_name !~ /^([^: \t]+)$/) {  # be generous
           return $INVALID_HEADER_FIELD_NAME;
         }
         $self->{parser}->add_test ($rulename, "defined($header_name)",

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1170488&r1=1170487&r2=1170488&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Wed Sep 14 09:14:19 2011
@@ -437,8 +437,8 @@ sub parse {
       elsif ($ret && $ret eq $Mail::SpamAssassin::Conf::INVALID_HEADER_FIELD_NAME)
       {
         $parse_error = "config: SpamAssassin failed to parse line, ".
-                        "\"$value\" does not specify a valid header field name for \"$key\", ".
-                        "skipping: $line";
+                       "it does not specify a valid header field name, ".
+                       "skipping: $line";
         goto failed_line;
       }
       elsif ($ret && $ret eq $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE)