diff options
| author | Andreas Schwab | 2012-06-26 11:39:52 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2012-06-26 11:39:52 +0200 |
| commit | d01fd55f641198bc7ba5752dd94c06a03ece7b83 (patch) | |
| tree | 8fc1c2bcc1bfb5749c34e43f138b8f5c8b0a1dcb /src | |
| parent | 50d5cb25c8ffa4139a216eff87f8e9714ff6c0f7 (diff) | |
| download | emacs-d01fd55f641198bc7ba5752dd94c06a03ece7b83.tar.gz emacs-d01fd55f641198bc7ba5752dd94c06a03ece7b83.zip | |
* gnutls.c (emacs_gnutls_handshake): Only retry if
GNUTLS_E_INTERRUPTED.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/gnutls.c | 2 |
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 @@ | |||
| 1 | 2012-06-26 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * gnutls.c (emacs_gnutls_handshake): Only retry if | ||
| 4 | GNUTLS_E_INTERRUPTED. | ||
| 5 | |||
| 1 | 2012-06-23 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-06-23 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * ralloc.c (r_alloc_inhibit_buffer_relocation): Fix stupid thinko | 8 | * 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) | |||
| 319 | ret = fn_gnutls_handshake (state); | 319 | ret = fn_gnutls_handshake (state); |
| 320 | emacs_gnutls_handle_error (state, ret); | 320 | emacs_gnutls_handle_error (state, ret); |
| 321 | } | 321 | } |
| 322 | while (ret < 0 && fn_gnutls_error_is_fatal (ret) == 0); | 322 | while (ret == GNUTLS_E_INTERRUPTED); |
| 323 | 323 | ||
| 324 | proc->gnutls_initstage = GNUTLS_STAGE_HANDSHAKE_TRIED; | 324 | proc->gnutls_initstage = GNUTLS_STAGE_HANDSHAKE_TRIED; |
| 325 | 325 | ||