From: Stephan Bosch <stephan@rename-it.nl>
Date: Tue, 22 Sep 2015 18:16:51 +0000 (+0300)
Subject: lib-http: client: Tunneled https peer addresses were not compared properly.
X-Git-Tag: 2.2.19.rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13bdd67aa0781d562cd2030da5092df1107d91f3;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: client: Tunneled https peer addresses were not compared properly.
The https_name field was ignored in that case.
---

diff --git a/src/lib-http/http-client-peer.c b/src/lib-http/http-client-peer.c
index 0de28f077e..79a3dabe86 100644
--- a/src/lib-http/http-client-peer.c
+++ b/src/lib-http/http-client-peer.c
@@ -88,7 +88,8 @@ int http_client_peer_addr_cmp
 			return ret;
 		if (peer1->a.tcp.port != peer2->a.tcp.port)
 			return (peer1->a.tcp.port > peer2->a.tcp.port ? 1 : -1);
-		if (peer1->type != HTTP_CLIENT_PEER_ADDR_HTTPS)
+		if (peer1->type != HTTP_CLIENT_PEER_ADDR_HTTPS &&
+			peer1->type != HTTP_CLIENT_PEER_ADDR_HTTPS_TUNNEL)
 			return 0;
 		return null_strcmp
 			(peer1->a.tcp.https_name, peer2->a.tcp.https_name);