Date: Wed, 17 Jul 2019 20:19:19 +0000 (UTC) From: Larry Rosenman <ler@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506824 - in head/mail/dovecot: . files Message-ID: <201907172019.x6HKJJjK025641@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ler Date: Wed Jul 17 20:19:19 2019 New Revision: 506824 URL: https://svnweb.freebsd.org/changeset/ports/506824 Log: mail/dovecot: One should actually TEST their patches. Fix previous commit. Pointy Hat To: ler Modified: head/mail/dovecot/Makefile head/mail/dovecot/files/patch-src_lib_ostream-file.c Modified: head/mail/dovecot/Makefile ============================================================================== --- head/mail/dovecot/Makefile Wed Jul 17 20:08:41 2019 (r506823) +++ head/mail/dovecot/Makefile Wed Jul 17 20:19:19 2019 (r506824) @@ -8,7 +8,7 @@ PORTNAME= dovecot PORTVERSION= 2.3.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail ipv6 MASTER_SITES= https://dovecot.org/releases/2.3/ Modified: head/mail/dovecot/files/patch-src_lib_ostream-file.c ============================================================================== --- head/mail/dovecot/files/patch-src_lib_ostream-file.c Wed Jul 17 20:08:41 2019 (r506823) +++ head/mail/dovecot/files/patch-src_lib_ostream-file.c Wed Jul 17 20:19:19 2019 (r506824) @@ -1,29 +1,29 @@ ---- src/lib/ostream-file.c.orig 2019-07-12 19:19:37 UTC +--- src/lib/ostream-file.c.orig 2019-07-12 10:46:25 UTC +++ src/lib/ostream-file.c @@ -333,17 +333,17 @@ static int buffer_flush(struct file_ostream *fstream) static void o_stream_tcp_flush_via_nodelay(struct file_ostream *fstream) { if (net_set_tcp_nodelay(fstream->fd, TRUE) < 0) { - if (errno != ENOTSUP && errno != ENOTSOCK && -- errno != ENOPROTOOPT && errno != EINVAL) { +- errno != ENOPROTOOPT) { - i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE) failed: %m", - o_stream_get_name(&fstream->ostream.ostream)); - } + /* Don't bother logging errors. There are quite a lot of -+ different errors that need to be ignored, and it differs -+ between OSes. At least: -+ Linux: ENOTSUP, ENOTSOCK, ENOPROTOOPT -+ FreeBSD: EINVAL, ECONNRESET */ ++ different errors that need to be ignored, and it differs ++ between OSes. At least: ++ Linux: ENOTSUP, ENOTSOCK, ENOPROTOOPT ++ FreeBSD: EINVAL, ECONNRESET */ fstream->no_socket_nodelay = TRUE; } else if (net_set_tcp_nodelay(fstream->fd, FALSE) < 0) { - /* We already successfully enabled TCP_NODELAY, so we're really - not expecting any errors here. */ - i_error("file_ostream.net_set_tcp_nodelay(%s, FALSE) failed: %m", - o_stream_get_name(&fstream->ostream.ostream)); -+ /* We already successfully enabled TCP_NODELAY, so there -+ shouldn't really be errors. Except ECONNRESET can possibly -+ still happen between these two calls, so again don't log -+ errors. */ ++ /* We already successfully enabled TCP_NODELAY, so there ++ shouldn't really be errors. Except ECONNRESET can possibly ++ still happen between these two calls, so again don't log ++ errors. */ fstream->no_socket_nodelay = TRUE; } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907172019.x6HKJJjK025641>