From: Tim Ruehsen <tim.ruehsen@gmx.de>
Date: Thu, 26 Dec 2013 20:17:07 +0000 (+0100)
Subject: fix GnuTLS connect timeout
X-Git-Tag: v1.15~4
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=3b6a3e84a013b53b03a8965e91aa0e9478c77841

fix GnuTLS connect timeout
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 42ce3e40..b3766ced 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-26  Tim Ruehsen  <tim.ruehsen@gmx.de>
+
+	* gnutls.c (ssl_connect_wget): Fix connect timeout failure
+
 2013-11-02  Giuseppe Scrivano  <gscrivan@redhat.com>
 
 	* http.c (gethttp): Increase max header value length to 512.
diff --git a/src/gnutls.c b/src/gnutls.c
index 9b4b1ec0..4f0fa962 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)
     {