This commit is contained in:
Nick Bebout 2011-03-12 02:43:54 +00:00
parent dd4b175c49
commit f66d0cf0dc
5 changed files with 18 additions and 13 deletions

View file

@ -1,6 +1,6 @@
Christophe Labouisse Christophe Labouisse
Add a pb with dbmail headers (first blank added) Add a pb with dbmail headers (first blank added, sort "Received:")
William Hernandez (fromESS/PR Webmasters) William Hernandez (fromESS/PR Webmasters)
Wrote patch for --timeout Wrote patch for --timeout

View file

@ -1,15 +1,19 @@
RCS file: RCS/imapsync,v RCS file: RCS/imapsync,v
Working file: imapsync Working file: imapsync
head: 1.83 head: 1.84
branch: branch:
locks: strict locks: strict
access list: access list:
symbolic names: symbolic names:
keyword substitution: kv keyword substitution: kv
total revisions: 83; selected revisions: 83 total revisions: 84; selected revisions: 84
description: description:
---------------------------- ----------------------------
revision 1.84
date: 2004/03/13 03:43:34; author: gilles; state: Exp; lines: +8 -7
Sort also same type headers (like Received)
----------------------------
revision 1.83 revision 1.83
date: 2004/03/12 02:29:00; author: gilles; state: Exp; lines: +8 -5 date: 2004/03/12 02:29:00; author: gilles; state: Exp; lines: +8 -5
Do not parse first blanks in headers (dbmail bug, thanks to Do not parse first blanks in headers (dbmail bug, thanks to

4
README
View file

@ -2,7 +2,7 @@ NAME
imapsync - IMAP sync or copy tool. Synchronize mailboxes between two imapsync - IMAP sync or copy tool. Synchronize mailboxes between two
imap servers. imap servers.
$Revision: 1.83 $ $Revision: 1.84 $
INSTALL INSTALL
imapsync works fine under any Unix OS. imapsync works fine under any Unix OS.
@ -211,5 +211,5 @@ AUTHOR
teaching free open and gratis softwares. Don't hesitate to pay him for teaching free open and gratis softwares. Don't hesitate to pay him for
that services. that services.
$Id: imapsync,v 1.83 2004/03/12 02:29:00 gilles Exp $ $Id: imapsync,v 1.84 2004/03/13 03:43:34 gilles Exp $

View file

@ -1 +1 @@
1.83 1.84

View file

@ -4,7 +4,7 @@
imapsync - IMAP sync or copy tool. Synchronize mailboxes between two imap servers. imapsync - IMAP sync or copy tool. Synchronize mailboxes between two imap servers.
$Revision: 1.83 $ $Revision: 1.84 $
=head1 INSTALL =head1 INSTALL
@ -249,7 +249,7 @@ Gilles LAMIRAL earn his living writing, installing,
configuring and teaching free open and gratis configuring and teaching free open and gratis
softwares. Don't hesitate to pay him for that services. softwares. Don't hesitate to pay him for that services.
$Id: imapsync,v 1.83 2004/03/12 02:29:00 gilles Exp $ $Id: imapsync,v 1.84 2004/03/13 03:43:34 gilles Exp $
=cut =cut
@ -286,7 +286,7 @@ my(
use vars qw ($opt_G); # missing code for this will be option. use vars qw ($opt_G); # missing code for this will be option.
$rcs = ' $Id: imapsync,v 1.83 2004/03/12 02:29:00 gilles Exp $ '; $rcs = ' $Id: imapsync,v 1.84 2004/03/13 03:43:34 gilles Exp $ ';
$rcs =~ m/,v (\d+\.\d+)/; $rcs =~ m/,v (\d+\.\d+)/;
$VERSION = ($1) ? $1 : "UNKNOWN"; $VERSION = ($1) ? $1 : "UNKNOWN";
@ -322,8 +322,8 @@ $error=0;
my $banner = join("", my $banner = join("",
'$RCSfile: imapsync,v $ ', '$RCSfile: imapsync,v $ ',
'$Revision: 1.83 $ ', '$Revision: 1.84 $ ',
'$Date: 2004/03/12 02:29:00 $ ', '$Date: 2004/03/13 03:43:34 $ ',
"\n", "\n",
"Mail::IMAPClient version used here is ", "Mail::IMAPClient version used here is ",
$VERSION_IMAPClient, " auth md5 : $md5_supported", $VERSION_IMAPClient, " auth md5 : $md5_supported",
@ -774,12 +774,13 @@ sub parse_header_msg {
my $head = $imap->parse_headers($m,"ALL"); my $head = $imap->parse_headers($m,"ALL");
my $headstr; my $headstr;
$debug and print "Head NUM:", scalar(keys(%$head)), "\n"; $debug and print "Head NUM:", scalar(keys(%$head)), "\n";
# no header -> return
return unless(scalar(keys(%$head))); return unless(scalar(keys(%$head)));
foreach my $h (sort keys(%$head)){ foreach my $h (sort keys(%$head)){
foreach my $val ( @{$head->{$h}}) { foreach my $val (sort @{$head->{$h}}) {
# no 8-bit data in headers ! # no 8-bit data in headers !
$val =~ s/[\x80-\xff]/X/g; $val =~ s/[\x80-\xff]/X/g;
# remove the first blanks (dbmail bug) # remove the first blanks (dbmail bug ?)
$val =~ s/^\s+//; $val =~ s/^\s+//;
# show stuff in debug mode # show stuff in debug mode
$debug and print "${s}H $h:", $val, "\n"; $debug and print "${s}H $h:", $val, "\n";