dovecot-2.2: lib-http: client: Tunneled https peer addresses wer...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/3a942625aaa0
changeset: 19188:3a942625aaa0
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Tue Sep 22 21:16:51 2015 +0300
description:
lib-http: client: Tunneled https peer addresses were not compared properly.
The https_name field was ignored in that case.

diffstat:

 src/lib-http/http-client-peer.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 1b1dbfaf7daa -r 3a942625aaa0 src/lib-http/http-client-peer.c
--- a/src/lib-http/http-client-peer.c	Tue Sep 22 21:16:34 2015 +0300
+++ b/src/lib-http/http-client-peer.c	Tue Sep 22 21:16:51 2015 +0300
@@ -88,7 +88,8 @@
 			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);