On 10/15, Daniel Stenberg wrote: > Ouch... > > This was just posted to the debian bug tracker system. I figure some > bisecting could be a good excercise here:
After a quick bisect: ee3551e45e60856eb0b779aa6cd34d77f16208a5 is the first bad commit commit ee3551e45e60856eb0b779aa6cd34d77f16208a5 Author: Alessandro Ghedini <[email protected]> Date: Mon Aug 20 16:47:48 2012 +0200 gnutls: do not fail on non-fatal handshake errors Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685402 D'oh. The attached patch seems to fix this. Cheers -- perl -E '$_=q;$/= @{[@_]};and s;\S+;<inidehG ordnasselA>;eg;say~~reverse'
From 53f25b103f54932fb6dce0c5dff1efe1227f2d8e Mon Sep 17 00:00:00 2001 From: Alessandro Ghedini <[email protected]> Date: Mon, 15 Oct 2012 16:06:54 +0200 Subject: [PATCH] gnutls: put reset code into else block Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690551 --- lib/gtls.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/gtls.c b/lib/gtls.c index 3b4dc40..24d7a62 100644 --- a/lib/gtls.c +++ b/lib/gtls.c @@ -308,11 +308,11 @@ static CURLcode handshake(struct connectdata *conn, 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
signature.asc
Description: Digital signature
------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.html
