From 57570cd38d7726a9a785f1162e6220b3afbdba46 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 28 Jun 2012 09:12:59 +0200 Subject: [PATCH] * gnutls.c (emacs_gnutls_handshake): Revert last change. Add QUIT to make the loop interruptible. --- src/ChangeLog | 5 +++++ src/gnutls.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3f874b616c6..ea44367e2bd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-06-28 Andreas Schwab + + * gnutls.c (emacs_gnutls_handshake): Revert last change. Add QUIT + to make the loop interruptible. + 2012-06-26 Andreas Schwab * gnutls.c (emacs_gnutls_handshake): Only retry if diff --git a/src/gnutls.c b/src/gnutls.c index 58f628f5d52..97b667a1f4e 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -318,8 +318,9 @@ emacs_gnutls_handshake (struct Lisp_Process *proc) { ret = fn_gnutls_handshake (state); emacs_gnutls_handle_error (state, ret); + QUIT; } - while (ret == GNUTLS_E_INTERRUPTED); + while (ret < 0 && fn_gnutls_error_is_fatal (ret) == 0); proc->gnutls_initstage = GNUTLS_STAGE_HANDSHAKE_TRIED; -- 2.39.2