* gnutls.c (emacs_gnutls_handshake): Revert last change. Add QUIT

to make the loop interruptible.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3f874b616c6489add378b4a1326220d0c16ac1dc..ea44367e2bd7a9a5c4ed5cc251621ca0e2ac18f1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * gnutls.c (emacs_gnutls_handshake): Revert last change.  Add QUIT
+       to make the loop interruptible.
+
 2012-06-26  Andreas Schwab  <schwab@linux-m68k.org>
 
        * gnutls.c (emacs_gnutls_handshake): Only retry if

diff --git a/src/gnutls.c b/src/gnutls.c
index 58f628f5d5276e8ecc153208995e253d1864441d..97b667a1f4ee488fb99a2439ca2aefd01b954d41 100644 (file)
--- 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;