← Back to branch summary

~ubuntu-branches/ubuntu/natty/spamassassin/natty

« back to all changes in this revision

Viewing changes to lib/Mail/SpamAssassin/Conf/Parser.pm

  • Committer: Package Import Robot
  • Author(s): Noah Meyerhans
  • Date: 2010-03-21 23:20:31 UTC
  • mfrom: (0.4.1) (1.4.1) (29.2.1 maverick)
  • Revision ID: package-import@ubuntu.com-20100321232031-ryqjxh9cx27epnka
Tags: 3.3.1-1
* New upstream version.
* Update several patches now that bugfixes have been incorporated
  upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Mail/SpamAssassin/Conf/Parser.pm
542
542
sub cond_clause_can {
543
543
  my ($self, $method) = @_;
544
544
 
 
545
  local($1,$2);
545
546
  if ($method =~ /^(.*)::([^:]+)$/) {
546
 
    return UNIVERSAL::can($1, $2);
 
547
    my($module, $meth) = ($1, $2);
 
548
    return UNIVERSAL::can($module, $meth);
547
549
  } else {
548
550
    $self->lint_warn("bad 'if' line, cannot find '::' in can($method), ".
549
551
                "in \"$self->{currentfile}\"", undef);
1123
1125
  }
1124
1126
  if ($type == $Mail::SpamAssassin::Conf::TYPE_HEAD_TESTS)
1125
1127
  {
1126
 
    if ($text =~ /^!?defined\([A-Za-z][A-Za-z0-9-]*\)$/) {
 
1128
    # RFC 5322 section 3.6.8, ftext printable US-ASCII chars not including ":"
 
1129
    if ($text =~ /^!?defined\([!-9;-\176]+\)$/) {
1127
1130
      # fine, implements 'exists:'
1128
1131
    } else {
1129
1132
      my ($pat) = ($text =~ /^\s*\S+\s*(?:\=|\!)\~\s*(\S.*?\S)\s*$/);