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

(emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal to Emacs that the socket should be closed.

Browse source
This commit is contained in:
Lars Magne Ingebrigtsen 2010-10-18 22:32:54 +02:00
parent e48eb34332
commit 4b2d9ec263
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2010-10-18 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnutls.c (emacs_gnutls_read): Return 0 if we get a
non-"EAGAIN"-like error to signal to Emacs that the socket should
be closed.
2010-10-15 Eli Zaretskii <eliz@gnu.org>
* unexcoff.c (make_hdr): Fix prototype according to changes in

9
src/gnutls.c
View file

@ -125,8 +125,13 @@ emacs_gnutls_read (int fildes, struct Lisp_Process *proc, char *buf,
rtnval = gnutls_read (state, buf, nbyte);
if (rtnval >= 0)
return rtnval;
else
return -1;
else {
if (rtnval == GNUTLS_E_AGAIN ||
rtnval == GNUTLS_E_INTERRUPTED)
return -1;
else
return 0;
}
}
/* convert an integer error to a Lisp_Object; it will be either a