summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gnutls.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 68bb4a030fb..3f874b616c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-26 Andreas Schwab <schwab@linux-m68k.org>
+
+ * gnutls.c (emacs_gnutls_handshake): Only retry if
+ GNUTLS_E_INTERRUPTED.
+
2012-06-23 Eli Zaretskii <eliz@gnu.org>
* ralloc.c (r_alloc_inhibit_buffer_relocation): Fix stupid thinko
diff --git a/src/gnutls.c b/src/gnutls.c
index 70eea3b0b89..58f628f5d52 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -319,7 +319,7 @@ emacs_gnutls_handshake (struct Lisp_Process *proc)
ret = fn_gnutls_handshake (state);
emacs_gnutls_handle_error (state, ret);
}
- while (ret < 0 && fn_gnutls_error_is_fatal (ret) == 0);
+ while (ret == GNUTLS_E_INTERRUPTED);
proc->gnutls_initstage = GNUTLS_STAGE_HANDSHAKE_TRIED;