From: Timo Sirainen <tss@iki.fi>
Date: Mon, 7 Dec 2009 20:06:27 +0000 (-0500)
Subject: lmtp proxy: Fixed output timeout handling.
X-Git-Tag: 2.0.beta1~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27e1bddf0385d23c1549237d362401be86e377bc;p=thirdparty%2Fdovecot%2Fcore.git

lmtp proxy: Fixed output timeout handling.

--HG--
branch : HEAD
---

diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index 2dc240b41d..03b8a2e7a5 100644
--- a/src/lmtp/lmtp-proxy.c
+++ b/src/lmtp/lmtp-proxy.c
@@ -296,7 +296,7 @@ int lmtp_proxy_add_rcpt(struct lmtp_proxy *proxy, const char *address,
 	return 0;
 }
 
-static size_t lmtp_proxy_find_lowest_offset(struct lmtp_proxy *proxy)
+static uoff_t lmtp_proxy_find_lowest_offset(struct lmtp_proxy *proxy)
 {
 	struct lmtp_proxy_connection *const *conns;
 	uoff_t min_offset = (uoff_t)-1;
@@ -305,7 +305,8 @@ static size_t lmtp_proxy_find_lowest_offset(struct lmtp_proxy *proxy)
 		struct lmtp_proxy_connection *conn = *conns;
 
 		if (conn->data_input != NULL &&
-		    min_offset > conn->data_input->v_offset)
+		    min_offset > conn->data_input->v_offset &&
+		    i_stream_have_bytes_left(conn->data_input))
 			min_offset = conn->data_input->v_offset;
 	}
 	return min_offset;