From: Artem Boldariev <artem@boldariev.com>
Date: Wed, 24 Nov 2021 12:03:44 +0000 (+0200)
Subject: DoH: Remove unneeded isc__nmsocket_prep_destroy() call
X-Git-Tag: v9.17.21~15^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b0c29dd51a410be48b86c72d575fa69f3c71d71;p=thirdparty%2Fbind9.git

DoH: Remove unneeded isc__nmsocket_prep_destroy() call

This commit removes unneeded isc__nmsocket_prep_destroy() call on ALPN
negotiation failure, which was eventually causing the TLS handle to
leak.

This call is not needed, as not attaching to the transport (TLS)
handle should be enough. At this point it seems like a kludge from
earlier days of the TLS code.
---

diff --git a/lib/isc/netmgr/http.c b/lib/isc/netmgr/http.c
index 776f0e2b77d..466ae5497ac 100644
--- a/lib/isc/netmgr/http.c
+++ b/lib/isc/netmgr/http.c
@@ -1379,7 +1379,6 @@ transport_connect_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
 			 * client will fail if HTTP/2 cannot be
 			 * negotiated via ALPN.
 			 */
-			isc__nmsocket_prep_destroy(transp_sock);
 			result = ISC_R_HTTP2ALPNERROR;
 			goto error;
 		}