commit 262a08a02869fa8e24a170be270c9cbc3607dbd4
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Jul 16 13:06:20 2019 +0200
- final upstream fix
dovecot-small_fixes.patch | 48 +++++++++++++++++++++++++++++++++++++++--------
dovecot.spec | 2 +-
2 files changed, 41 insertions(+), 9 deletions(-)
---
diff --git a/dovecot.spec b/dovecot.spec
index b6a47e2..a58cf7e 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -163,7 +163,7 @@ Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p0
+%patch2 -p1
%{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g'
doc/example-config/*.conf doc/example-config/conf.d/*.conf
diff --git a/dovecot-small_fixes.patch b/dovecot-small_fixes.patch
index 5c3cc5d..2cbd631 100644
--- a/dovecot-small_fixes.patch
+++ b/dovecot-small_fixes.patch
@@ -1,11 +1,43 @@
---- src/lib/ostream-file.c.orig 2019-07-12 19:18:41 UTC
-+++ src/lib/ostream-file.c
-@@ -334,7 +334,7 @@ static void o_stream_tcp_flush_via_nodelay(struct file
+From 25028730cd1b76e373ff989625132d526eea2504 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <[email protected]>
+Date: Mon, 15 Jul 2019 10:14:23 +0300
+Subject: [PATCH] lib: ostream-file: Don't log any errors when setting
+ TCP_NODELAY
+
+It's likely never useful to log the error, and it seems more and more
+unexpected errors just keep popping up.
+---
+ src/lib/ostream-file.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/lib/ostream-file.c b/src/lib/ostream-file.c
+index e7e6f62d12..82bf729ac0 100644
+--- a/src/lib/ostream-file.c
++++ b/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 &&
+- if (errno != ENOTSUP && errno != ENOTSOCK &&
- errno != ENOPROTOOPT) {
-+ errno != ENOPROTOOPT && errno != EINVAL) {
- i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE)
failed: %m",
- o_stream_get_name(&fstream->ostream.ostream));
- }
+- 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 */
+ 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. */
+ fstream->no_socket_nodelay = TRUE;
+ }
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dovecot.git/commitdiff/262a08a02869fa8e24a170be270c9cbc3607dbd4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
