cvs commit: qpsmtpd/lib/Qpsmtpd TcpServer.pm SMTP.pm

cvsuser     04/11/19 00:44:24

  Modified:    lib/Qpsmtpd TcpServer.pm SMTP.pm
  Log:
  Fix timeout config warnings.
  Fix alarm not being reset at end of while loop
  
  Revision  Changes    Path
  1.12      +1 -0      qpsmtpd/lib/Qpsmtpd/TcpServer.pm
  
  Index: TcpServer.pm
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/lib/Qpsmtpd/TcpServer.pm,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TcpServer.pm	1 Aug 2004 06:56:33 -0000	1.11
  +++ TcpServer.pm	19 Nov 2004 08:44:24 -0000	1.12
  @@ -62,6 +62,7 @@
         or $self->respond(502, "command unrecognized: '$_'");
       alarm $timeout;
     }
  +  alarm(0);
   }
   
   sub respond {
  
  
  
  1.45      +3 -5      qpsmtpd/lib/Qpsmtpd/SMTP.pm
  
  Index: SMTP.pm
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/lib/Qpsmtpd/SMTP.pm,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- SMTP.pm	23 Sep 2004 13:51:09 -0000	1.44
  +++ SMTP.pm	19 Nov 2004 08:44:24 -0000	1.45
  @@ -429,8 +429,8 @@
   
     my $header = Mail::Header->new(Modify => 0, MailFrom => "COERCE");
   
  -
  -  while (defined($_ = $self->getline)) {
  +  my $timeout = $self->config('timeout');
  +  while (defined($_ = $self->getline($timeout))) {
       $complete++, last if $_ eq ".\r\n";
       $i++;
   
  @@ -524,10 +524,8 @@
   }
   
   sub getline {
  -  my $self = shift;
  +  my ($self, $timeout) = @_;
     
  -  my $timeout = $self->config('timeout');
  -
     alarm $timeout;
     my $line = <STDIN>; # default implementation
     alarm 0;