You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2019/05/05 09:53:31 UTC
svn commit: r1858662 -
/spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm
Author: gbechis
Date: Sun May 5 09:53:30 2019
New Revision: 1858662
URL: http://svn.apache.org/viewvc?rev=1858662&view=rev
Log:
Detect if server is running with SSL enabled and give an hint
before a criptic message
fix bz #7184
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm?rev=1858662&r1=1858661&r2=1858662&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm Sun May 5 09:53:30 2019
@@ -24,6 +24,7 @@ use warnings;
# use bytes;
use re 'taint';
use Errno qw();
+use Scalar::Util qw(blessed);
use Mail::SpamAssassin::Util qw(am_running_on_windows);
use Mail::SpamAssassin::Logger;
@@ -528,6 +529,9 @@ sub wait_for_child_to_accept {
return;
}
else {
+ if( Scalar::Util::blessed($self->{server_fh}[0]) eq 'IO::Socket::SSL' ) {
+ warn "prefork: SSL connection protocol error";
+ }
warn "prefork: ordered child $kid to accept, but they reported state '$state', killing rogue";
$self->child_error_kill($kid, $sock);
$self->adapt_num_children();