[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-53-g25a9673

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=25a9673157fabb5ef96af862a104a9f2151102d6

The branch, master has been updated
       via  25a9673157fabb5ef96af862a104a9f2151102d6 (commit)
      from  570b0bfd8659d77785308adc991234fd4d1a1e91 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 25a9673157fabb5ef96af862a104a9f2151102d6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Sep 2 18:46:47 2012 +0200

    The default system_recv_timeout() doesn't include a call to recv() to avoid 
issue in few systems.

-----------------------------------------------------------------------

Summary of changes:
 lib/gnutls_buffers.c |    3 +--
 lib/system.c         |    6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index ea7a77a..3dc10d2 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -655,10 +655,9 @@ _gnutls_io_check_recv (gnutls_session_t session, unsigned 
int ms)
   reset_errno (session);
 
   ret = session->internals.pull_timeout_func(fd, ms);
-
-  err = get_errno (session);
   if (ret == -1)
     {
+      err = get_errno (session);
       _gnutls_read_log ("READ_TIMEOUT: %d returned from %p, errno=%d (timeout: 
%u)\n",
                        (int) ret, fd, err, ms);
       return errno_to_gerr(err);
diff --git a/lib/system.c b/lib/system.c
index 14bd085..067f189 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -125,7 +125,7 @@ int system_recv_timeout(gnutls_transport_ptr_t ptr, 
unsigned int ms)
 {
 fd_set rfds;
 struct timeval tv;
-int ret, ret2;
+int ret;
 int fd = GNUTLS_POINTER_TO_INT(ptr);
 
   FD_ZERO(&rfds);
@@ -144,10 +144,6 @@ int fd = GNUTLS_POINTER_TO_INT(ptr);
   if (ret <= 0)
     return ret;
 
-  ret2 = recv(fd, NULL, 0, MSG_PEEK);
-  if (ret2 == -1)
-    return ret2;
-      
   return ret;
 }
 


hooks/post-receive
-- 
GNU gnutls