[Emacs-diffs] /srv/bzr/emacs/trunk r101990: (emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal to Emacs that the socket should be closed.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 101990
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2010-10-18 22:32:54 +0200
message:
  (emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal 
to Emacs that the socket should be closed.
modified:
  src/ChangeLog
  src/gnutls.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-15 18:42:54 +0000
+++ b/src/ChangeLog     2010-10-18 20:32:54 +0000
@@ -1,3 +1,9 @@
+2010-10-18  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * unexcoff.c (make_hdr): Fix prototype according to changes in

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2010-10-10 18:47:45 +0000
+++ b/src/gnutls.c      2010-10-18 20:32:54 +0000
@@ -125,8 +125,13 @@
   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