aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Ingebrigtsen2012-02-11 18:06:14 +0100
committerLars Ingebrigtsen2012-02-11 18:06:14 +0100
commit77abcbc2412cef1dd88e9843e8122dcf90d2b924 (patch)
treef1205283f8b6536736ae5e83f0415c73432701f6 /src
parentd860baa0c3b1c81c342bf5b4a330a5e6826e255e (diff)
downloademacs-77abcbc2412cef1dd88e9843e8122dcf90d2b924.tar.gz
emacs-77abcbc2412cef1dd88e9843e8122dcf90d2b924.zip
* gnutls.c (emacs_gnutls_write): Don't infloop if sendto fails.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/gnutls.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 30e81707642..d18c1b0344e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-02-11 Lars Ingebrigtsen <larsi@gnus.org>
2
3 * gnutls.c (emacs_gnutls_write): Don't infloop if sendto fails.
4
12012-02-11 Eli Zaretskii <eliz@gnu.org> 52012-02-11 Eli Zaretskii <eliz@gnu.org>
2 6
3 * w32select.c (Fx_selection_exists_p): Sync doc string and 7 * w32select.c (Fx_selection_exists_p): Sync doc string and
diff --git a/src/gnutls.c b/src/gnutls.c
index d7bf0e8edb8..5da84bdd960 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -363,7 +363,7 @@ emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, EMACS_INT nbyte)
363 363
364 if (rtnval < 0) 364 if (rtnval < 0)
365 { 365 {
366 if (rtnval == GNUTLS_E_AGAIN || rtnval == GNUTLS_E_INTERRUPTED) 366 if (rtnval == GNUTLS_E_INTERRUPTED)
367 continue; 367 continue;
368 else 368 else
369 break; 369 break;