From c09d62159b21b117069e2bdf38b7d10a82c1eff5 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 7 Apr 2011 12:56:51 +0200 Subject: [PATCH] Remove tight loop around gnutls_record_recv. --- src/ChangeLog | 2 ++ src/gnutls.c | 11 ++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index efecdc82..e3581517 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,6 +3,8 @@ * gnutls.c (ssl_init): Allow X509 v1 certificates. Suggested by: Ray Satiro + (wgnutls_peek): Remove tight loop around gnutls_record_recv. + 2011-04-07 Ray Satiro (tiny change) (wgnutls_read): Check for the GNUTLS_E_AGAIN return code in the recv diff --git a/src/gnutls.c b/src/gnutls.c index 50957e5c..564170fe 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -202,15 +202,8 @@ wgnutls_peek (int fd, char *buf, int bufsize, void *arg) if (ret < 0) return ret; #endif - do - { - ret = gnutls_record_recv (ctx->session, buf + offset, - bufsize - offset); - } - while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN); - - read = ret; - + read = gnutls_record_recv (ctx->session, buf + offset, + bufsize - offset); if (read < 0) { if (offset) -- 2.39.2