dovecot-2.2: lib-http: client: With the recent addition of a con...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Oct 12 16:00:12 UTC 2014
details: http://hg.dovecot.org/dovecot-2.2/rev/b254b7dc717f
changeset: 17942:b254b7dc717f
user: Stephan Bosch <stephan at rename-it.nl>
date: Sun Oct 12 08:58:40 2014 -0700
description:
lib-http: client: With the recent addition of a connection attempt limit, connection failures weren't always handled correctly.
diffstat:
src/lib-http/http-client-queue.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (16 lines):
diff -r 871a5b807ad0 -r b254b7dc717f src/lib-http/http-client-queue.c
--- a/src/lib-http/http-client-queue.c Sun Oct 12 08:58:40 2014 -0700
+++ b/src/lib-http/http-client-queue.c Sun Oct 12 08:58:40 2014 -0700
@@ -172,9 +172,9 @@
i_assert(queue->ips_connect_start_idx < host->ips_count);
/* if a maximum connect attempts > 1 is set, enforce it directly */
- if (set->max_connect_attempts > 1) {
- return queue->connect_attempts >= set->max_connect_attempts;
- }
+ if (set->max_connect_attempts > 1 &&
+ queue->connect_attempts >= set->max_connect_attempts)
+ return TRUE;
/* otherwise, we'll always go through all the IPs. we don't necessarily
start connecting from the first IP, so we'll need to treat the IPs as
More information about the dovecot-cvs
mailing list