From: Robert Pluim <rpluim@gmail.com>
Date: Mon, 15 Jul 2019 11:28:25 +0000 (+0200)
Subject: Don't delete GnuTLS boot parameters too early
X-Git-Tag: emacs-27.0.90~1898
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b34c6d2c9694ec300b92129dbf88fe012837dfe2;p=emacs.git

Don't delete GnuTLS boot parameters too early

* src/process.c (connect_network_socket): Don't delete the GnuTLS
boot parameters until after we've managed to connect at the IP
level (bug#36660).
---

diff --git a/src/process.c b/src/process.c
index 5f552675db6..abadabe77ea 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3682,11 +3682,13 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos,
       Lisp_Object boot, params = p->gnutls_boot_parameters;
 
       boot = Fgnutls_boot (proc, XCAR (params), XCDR (params));
-      p->gnutls_boot_parameters = Qnil;
 
       if (p->gnutls_initstage == GNUTLS_STAGE_READY)
-	/* Run sentinels, etc. */
-	finish_after_tls_connection (proc);
+        {
+          p->gnutls_boot_parameters = Qnil;
+	  /* Run sentinels, etc. */
+	  finish_after_tls_connection (proc);
+        }
       else if (p->gnutls_initstage != GNUTLS_STAGE_HANDSHAKE_TRIED)
 	{
 	  deactivate_process (proc);