romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 19:33:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

nss: fix tight loop in non-blocking TLS handhsake over proxy

Browse source 
... in case the handshake completes before entering
CURLM_STATE_PROTOCONNECT

Bug: https://bugzilla.redhat.com/1388162
This commit is contained in:
Martin Frodl 2016-10-24 17:44:45 +02:00 • committed by Kamil Dudka
parent d2c6d1568e
commit eb84412b33
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/vtls/nss.c
View file

@ -1921,8 +1921,11 @@ static CURLcode nss_connect_common(struct connectdata *conn, int sockindex,
const bool blocking = (done == NULL);
CURLcode result;
if(connssl->state == ssl_connection_complete)
if(connssl->state == ssl_connection_complete) {
if(!blocking)
*done = TRUE;
return CURLE_OK;
}
if(connssl->connecting_state == ssl_connect_1) {
result = nss_setup_connect(conn, sockindex);