-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[EMAIL PROTECTED] writes:
> Author: quinlan
> Date: Fri Jan  7 00:06:07 2005
> New Revision: 124477
> 
> URL: http://svn.apache.org/viewcvs?view=rev&rev4477
> Log:
> promote T_BAD_ISO_CHARSET to MIME_BAD_ISO_CHARSET, but convert it to an
> eval function to avoid using a full test

we should really figure out some way to expose those in-body MIME headers
in a new rule type...

- --j.

> Modified:
>    spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
>    spamassassin/trunk/rules/20_body_tests.cf
>    spamassassin/trunk/rules/70_testing.cf
> 
> Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
> Url:
> http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?view=diff&rev4477&p1=spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm&r14476&p2=spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm&r24477
> =============================================================================---
>  spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm        (original)
> +++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm     Fri Jan  7 
> 00:06:07 2005
> @@ -2353,6 +2353,12 @@
>      $self->{mime_base64_no_name} = 1;
>    }
>  
> +  if ($charset =~ /iso-\S+-\S+\b/i &&
> +      $charset !~ /iso-(?:8859-\d{1,2}|2022-(?:jp|kr))\b/)
> +  {
> +    $self->{mime_bad_iso_charset} = 1;
> +  }
> +
>    # MIME_BASE64_LATIN: now a zero-hitter
>    # if (!$name &&
>    # $cte =~ /base64/ &&
> @@ -2414,7 +2420,7 @@
>       || ($name eq "xls" && $ctype !~ [EMAIL PROTECTED]/.*excel$@)
>         )
>      {
> -       $self->{mime_suspect_name} = 1;
> +      $self->{mime_suspect_name} = 1;
>      }
>    }
>  }
> 
> Modified: spamassassin/trunk/rules/20_body_tests.cf
> Url:
> http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_body_tests.cf?view=diff&rev4477&p1=spamassassin/trunk/rules/20_body_tests.cf&r14476&p2=spamassassin/trunk/rules/20_body_tests.cf&r24477
> =============================================================================---
>  spamassassin/trunk/rules/20_body_tests.cf    (original)
> +++ spamassassin/trunk/rules/20_body_tests.cf Fri Jan  7 00:06:07 2005
> @@ -123,6 +123,9 @@
>  body MPART_ALT_DIFF_COUNT    
> eval:multipart_alternative_difference_count('3', '1')
>  describe MPART_ALT_DIFF_COUNT        HTML and text parts are different
>  
> +body MIME_BAD_ISO_CHARSET    eval:check_for_mime('mime_bad_iso_charset')
> +describe MIME_BAD_ISO_CHARSET        MIME character set is an unknown ISO 
> charset
> +
>  ###########################################################################
>  
>  body CHARSET_FARAWAY         eval:check_for_faraway_charset()
> 
> Modified: spamassassin/trunk/rules/70_testing.cf
> Url:
> http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?view=diff&rev4477&p1=spamassassin/trunk/rules/70_testing.cf&r14476&p2=spamassassin/trunk/rules/70_testing.cf&r24477
> =============================================================================---
>  spamassassin/trunk/rules/70_testing.cf       (original)
> +++ spamassassin/trunk/rules/70_testing.cf    Fri Jan  7 00:06:07 2005
> @@ -354,11 +354,4 @@
>  
>  ########################################################################
>  
> -# bug 4054: contributions from Maxime Ritter (airmax.cf)
> -
> -# only works on full, may be better to check in Message object for this
> -full __ISO_VALID             
> /charset=\"?iso-(?:8859-\d{1,2}|2022-(?:jp|kr))\b/i
> -full __ISO_CHARSET           /charset=\"?iso-\S+-\S+\b/i
> -meta T_BAD_ISO_CHARSET               (__ISO_CHARSET && !__ISO_VALID)
> -
>  body T_NORMAL_HTTP_TO_IP     eval:check_numeric_http()
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
Comment: Exmh CVS

iD8DBQFB3t6EMJF5cimLx9ARAh0CAJ9UL1xcUI/yBjRzgE63oAXdyflc8gCcD0NC
FtfNG2YkwDEO6I7zMNzoygY=
=01eO
-----END PGP SIGNATURE-----

Reply via email to