fix GnuTLS connect timeout

This commit is contained in:
Tim Ruehsen 2013-12-26 21:17:07 +01:00 committed by Giuseppe Scrivano
parent fb23bc0611
commit 3b6a3e84a0
2 changed files with 6 additions and 3 deletions

View File

@ -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> 2013-11-02 Giuseppe Scrivano <gscrivan@redhat.com>
* http.c (gethttp): Increase max header value length to 512. * http.c (gethttp): Increase max header value length to 512.

View File

@ -526,8 +526,7 @@ ssl_connect_wget (int fd, const char *hostname)
break; break;
} }
if (err <= 0) err = GNUTLS_E_AGAIN;
break;
} }
else if (err < 0) 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) if (opt.connect_timeout)
{ {