diff options
| author | Robert Pluim | 2019-07-15 13:28:25 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-07-15 13:30:11 +0200 |
| commit | b34c6d2c9694ec300b92129dbf88fe012837dfe2 (patch) | |
| tree | ccb4cf985854654b26febfb8c0808a58fdde5c2e | |
| parent | c8c23c980ed61b9a2bec829c6bed2a73c6889742 (diff) | |
| download | emacs-b34c6d2c9694ec300b92129dbf88fe012837dfe2.tar.gz emacs-b34c6d2c9694ec300b92129dbf88fe012837dfe2.zip | |
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).
| -rw-r--r-- | src/process.c | 8 |
1 files changed, 5 insertions, 3 deletions
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, | |||
| 3682 | Lisp_Object boot, params = p->gnutls_boot_parameters; | 3682 | Lisp_Object boot, params = p->gnutls_boot_parameters; |
| 3683 | 3683 | ||
| 3684 | boot = Fgnutls_boot (proc, XCAR (params), XCDR (params)); | 3684 | boot = Fgnutls_boot (proc, XCAR (params), XCDR (params)); |
| 3685 | p->gnutls_boot_parameters = Qnil; | ||
| 3686 | 3685 | ||
| 3687 | if (p->gnutls_initstage == GNUTLS_STAGE_READY) | 3686 | if (p->gnutls_initstage == GNUTLS_STAGE_READY) |
| 3688 | /* Run sentinels, etc. */ | 3687 | { |
| 3689 | finish_after_tls_connection (proc); | 3688 | p->gnutls_boot_parameters = Qnil; |
| 3689 | /* Run sentinels, etc. */ | ||
| 3690 | finish_after_tls_connection (proc); | ||
| 3691 | } | ||
| 3690 | else if (p->gnutls_initstage != GNUTLS_STAGE_HANDSHAKE_TRIED) | 3692 | else if (p->gnutls_initstage != GNUTLS_STAGE_HANDSHAKE_TRIED) |
| 3691 | { | 3693 | { |
| 3692 | deactivate_process (proc); | 3694 | deactivate_process (proc); |