remove the workaround for -prefork, fixed by rev 893

git-svn-id: https://svn.perl.org/qpsmtpd/trunk@894 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Hanno Hecker 2008-05-09 17:41:59 +00:00
parent ea243c2f2f
commit b5d9135fb0

View File

@ -104,10 +104,6 @@ HOOK: foreach my $hook ( keys %{$qp->hooks} ) {
} }
} }
} }
# work-around for failed connections in -prefork after STARTTLS connection:
$self->register_hook('post-connection', 'prefork_workaround')
if $qp->isa('Qpsmtpd::SMTP::Prefork');
} }
sub hook_ehlo { sub hook_ehlo {
@ -240,17 +236,6 @@ sub bad_ssl_hook {
} }
*hook_helo = *hook_data = *hook_rcpt = *hook_mail = \&bad_ssl_hook; *hook_helo = *hook_data = *hook_rcpt = *hook_mail = \&bad_ssl_hook;
# work-around for failed connections in -prefork after STARTTLS connection:
sub prefork_workaround {
my $self = shift;
# nothing to do on SSL only (SMTPS) and clear text communications
return (DECLINED) if $self->connection->local_port == 465;
return (DECLINED) unless $self->connection->notes('tls_enabled');
$self->log(LOGWARN, "Exiting because 'tls_enabled' was true.");
exit;
}
package UpgradeClientSSL; package UpgradeClientSSL;
# borrowed heavily from Perlbal::SocketSSL # borrowed heavily from Perlbal::SocketSSL