|
From: <jgr...@us...> - 2003-07-09 21:15:42
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv10869/Proxy
Modified Files:
NNTP.pm POP3.pm Proxy.pm SMTP.pm
Log Message:
Fix problem where the last message up the pipe from a proxy could get lost
Index: NNTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NNTP.pm 9 Jul 2003 18:18:21 -0000 1.12
--- NNTP.pm 9 Jul 2003 21:15:39 -0000 1.13
***************
*** 310,313 ****
--- 310,314 ----
close $news if defined( $news );
close $client;
+ print $pipe "CMPLT$eol";
close $pipe;
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** POP3.pm 9 Jul 2003 18:18:21 -0000 1.61
--- POP3.pm 9 Jul 2003 21:15:39 -0000 1.62
***************
*** 402,407 ****
# Tell the parent that we just handled a mail
- print $pipe "CLASS:$class$eol";
print $pipe "NEWFL:$history_file$eol";
# Note locally that file has been retrieved
--- 402,407 ----
# Tell the parent that we just handled a mail
print $pipe "NEWFL:$history_file$eol";
+ print $pipe "CLASS:$class$eol";
# Note locally that file has been retrieved
***************
*** 440,443 ****
--- 440,444 ----
close $mail if defined( $mail );
close $client;
+ print $pipe "CMPLT$eol";
close $pipe;
Index: Proxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Proxy.pm 9 Jul 2003 18:18:21 -0000 1.18
--- Proxy.pm 9 Jul 2003 21:15:39 -0000 1.19
***************
*** 195,198 ****
--- 195,200 ----
$message =~ s/[\r\n]//g;
+ $self->log_( "Child proxy message $message" );
+
if ( $message =~ /CLASS:(.*)/ ) {
***************
*** 201,205 ****
$self->mq_post_( 'CLASS', $1, '' );
- $self->log_( "Incrementing $1" );
}
--- 203,206 ----
Index: SMTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/SMTP.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SMTP.pm 9 Jul 2003 18:18:21 -0000 1.14
--- SMTP.pm 9 Jul 2003 21:15:39 -0000 1.15
***************
*** 245,248 ****
--- 245,250 ----
close $mail if defined( $mail );
close $client;
+ print $pipe "CMPLT$eol";
+ close $pipe;
}
|