git://git.jankratochvil.net
/
PerlMail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+=ats
[PerlMail.git]
/
perlmail-accept
diff --git
a/perlmail-accept
b/perlmail-accept
index
ab934b0
..
9cea4a8
100755
(executable)
--- a/
perlmail-accept
+++ b/
perlmail-accept
@@
-638,7
+638,8
@@
sub Received_for
my($for)=($hdr=~/\bfor\s+\<?(\S+)\>?\b/);
return $for if !wantarray();
push @r,$for if $for;
my($for)=($hdr=~/\bfor\s+\<?(\S+)\>?\b/);
return $for if !wantarray();
push @r,$for if $for;
- my($from,$fromaddr)=($hdr=~/\bfrom\s+(\S+)\b.*?\[((?:\d{1,3}\.){3}\d{1,3})\]/);
+ my($from,$fromaddr)=($hdr=~/\bfrom\s+(?:(\S+)\b.*?)??\[((?:\d{1,3}\.){3}\d{1,3})\]/);
+ $from=$fromaddr if !defined $from;
push @r,"$from:$fromaddr" if $from;
}
return @r;
push @r,"$from:$fromaddr" if $from;
}
return @r;