[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108060: * gnutls.c (emacs_gnutls_handshake): Revert last change. Add QUIT

[Andreas Schwab]

------------------------------------------------------------
revno: 108060
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Thu 2012-06-28 09:12:59 +0200
message:
  * gnutls.c (emacs_gnutls_handshake): Revert last change.  Add QUIT
  to make the loop interruptible.
modified:
  src/ChangeLog
  src/gnutls.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-26 09:39:52 +0000
+++ b/src/ChangeLog     2012-06-28 07:12:59 +0000
@@ -1,3 +1,8 @@
+2012-06-28  Andreas Schwab  <address@hidden>
+
+       * gnutls.c (emacs_gnutls_handshake): Revert last change.  Add QUIT
+       to make the loop interruptible.
+
 2012-06-26  Andreas Schwab  <address@hidden>
 
        * gnutls.c (emacs_gnutls_handshake): Only retry if

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2012-06-26 09:39:52 +0000
+++ b/src/gnutls.c      2012-06-28 07:12:59 +0000
@@ -318,8 +318,9 @@
     {
       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;