From 2ae35d66fe939fee917f115005843ab49cb5d944 Mon Sep 17 00:00:00 2001 From: Alessandro Ghedini Date: Mon, 20 Aug 2012 16:47:48 +0200 Subject: [PATCH] gnutls: do not fail on non-fatal handshake errors --- lib/gtls.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/gtls.c b/lib/gtls.c index c750a6f..a912e31 100644 --- a/lib/gtls.c +++ b/lib/gtls.c @@ -302,15 +302,17 @@ static CURLcode handshake(struct connectdata *conn, if(nonblocking) return CURLE_OK; } + else if((rc < 0) && gnutls_error_is_fatal(rc)) { + failf(data, "gnutls_handshake() warning: %s", gnutls_strerror(rc)); + } else if(rc < 0) { failf(data, "gnutls_handshake() failed: %s", gnutls_strerror(rc)); return CURLE_SSL_CONNECT_ERROR; } - else { - /* Reset our connect state machine */ - connssl->connecting_state = ssl_connect_1; - return CURLE_OK; - } + + /* Reset our connect state machine */ + connssl->connecting_state = ssl_connect_1; + return CURLE_OK; } } -- 1.7.10.4