From ebd65af51f3d02965e7e98acd34ff00715adca44 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 Apr 2024 20:56:32 +0200 Subject: Merging upstream version 3.7.11. Signed-off-by: Daniel Baumann --- src/tlsmgr/tlsmgr.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/tlsmgr') diff --git a/src/tlsmgr/tlsmgr.c b/src/tlsmgr/tlsmgr.c index 28ca961..d32e63d 100644 --- a/src/tlsmgr/tlsmgr.c +++ b/src/tlsmgr/tlsmgr.c @@ -818,6 +818,23 @@ static void tlsmgr_service(VSTREAM *client_stream, char *unused_service, } } + /* + * Workaround: some OS lies under load. It tells the Postfix event + * handler that a server socket is readable, then it tells peekfd() that + * the socket has unread data, and then it tells vstring_get_null() that + * there is none, causing Postfix to spam the log with warning messages. + * Close the stream to stop such nonsense; the client can reconnect if it + * still wants to talk to us. + * + * XXX Why is this problem not reported for the other five + * multi_server-based Postfix services? + */ + else if (vstream_ferror(client_stream) || vstream_feof(client_stream)) { + multi_server_disconnect(client_stream); + return; + /* Note: client_stream is now a dangling pointer. */ + } + /* * Protocol error. */ -- cgit v1.2.3