[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b34c6d2: Don't delete GnuTLS boot parameters too ea
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master b34c6d2: Don't delete GnuTLS boot parameters too early |
Date: |
Mon, 15 Jul 2019 07:30:20 -0400 (EDT) |
branch: master
commit b34c6d2c9694ec300b92129dbf88fe012837dfe2
Author: Robert Pluim <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
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).
---
src/process.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/process.c b/src/process.c
index 5f55267..abadabe 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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b34c6d2: Don't delete GnuTLS boot parameters too early,
Lars Ingebrigtsen <=