>From 41f9db4f5d309d605d90613c1dd5c208be8024aa Mon Sep 17 00:00:00 2001 From: Tim Ruehsen Date: Thu, 26 Dec 2013 21:17:07 +0100 Subject: [PATCH] fix GnuTLS connect timeout --- src/ChangeLog | 4 ++++ src/gnutls.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index fe4c321..22d036c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-12-26 Tim Ruehsen + + * gnutls.c (ssl_connect_wget): Fix connect timeout failure + 2013-11-10 Giuseppe Scrivano * options.h (struct options) [!ENABLE_THREADS]: Define jobs. diff --git a/src/gnutls.c b/src/gnutls.c index 9b4b1ec..4f0fa96 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -526,8 +526,7 @@ ssl_connect_wget (int fd, const char *hostname) break; } - if (err <= 0) - break; + err = GNUTLS_E_AGAIN; } else if (err < 0) { @@ -543,7 +542,7 @@ ssl_connect_wget (int fd, const char *hostname) } } } - while (err == GNUTLS_E_WARNING_ALERT_RECEIVED && gnutls_error_is_fatal (err) == 0); + while (err && gnutls_error_is_fatal (err) == 0); if (opt.connect_timeout) { -- 1.8.5.2