fix GnuTLS connect timeout

diff --git a/src/ChangeLog b/src/ChangeLog
index 42ce3e40ca1145c6bbdf0c327dd98cb2fffaf681..b3766ced84e0b9d8fbec1ebb3b9458a1ee87bcc8 100644 (file)
--- 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 9b4b1ec0d8e98b38b514cf5e3f30a9f089e993d7..4f0fa962537b304c7766947c12c29a0c13e77795 100644 (file)
--- 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)
     {