procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
to make the loop interruptible.
This commit is contained in:
Andreas Schwab 2012-06-28 09:12:59 +02:00
parent d01fd55f64
commit 57570cd38d
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

3
src/gnutls.c
View file

@ -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;