dovecot-2.2: imap-proxy: Recent changes caused CAPABILITY repeat...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/d06f4f1bdaaf
changeset: 17106:d06f4f1bdaaf
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Jan 15 15:03:22 2014 -0500
description:
imap-proxy: Recent changes caused CAPABILITY repeating with pipelining disabled.

diffstat:

 src/imap-login/client.h     |  1 +
 src/imap-login/imap-proxy.c |  6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r ccb3535bf650 -r d06f4f1bdaaf src/imap-login/client.h
--- a/src/imap-login/client.h	Wed Jan 15 03:49:42 2014 +0200
+++ b/src/imap-login/client.h	Wed Jan 15 15:03:22 2014 -0500
@@ -21,6 +21,7 @@
 	unsigned int proxy_seen_banner:1;
 	unsigned int skip_line:1;
 	unsigned int id_logged:1;
+	unsigned int proxy_capability_request_sent:1;
 	unsigned int client_ignores_capability_resp_code:1;
 	unsigned int auth_mech_name_parsed:1;
 };
diff -r ccb3535bf650 -r d06f4f1bdaaf src/imap-login/imap-proxy.c
--- a/src/imap-login/imap-proxy.c	Wed Jan 15 03:49:42 2014 +0200
+++ b/src/imap-login/imap-proxy.c	Wed Jan 15 15:03:22 2014 -0500
@@ -69,8 +69,10 @@
 	   it), send the (unnecessary) CAPABILITY command to backend as well
 	   to avoid sending the CAPABILITY reply twice (untagged and OK resp
 	   code). */
-	if (client->proxy_backend_capability == NULL ||
-	    client->client_ignores_capability_resp_code) {
+	if (!client->proxy_capability_request_sent &&
+	    (client->proxy_backend_capability == NULL ||
+	     client->client_ignores_capability_resp_code)) {
+		client->proxy_capability_request_sent = TRUE;
 		str_append(str, "C CAPABILITY\r\n");
 		if (client->common.proxy_nopipelining) {
 			/* authenticate only after receiving C OK reply. */