Commit f2285a6d authored by Yang Tse's avatar Yang Tse
Browse files

hostip.c: return immediately from Curl_resolv_timeout() upon expired timeout. 

Ensure existing logic in Curl_resolv_timeout() is not subverted upon getting a
negative timeout from resolve_server(). The timeout in resolve_server() could
be checked to avoid calling Curl_resolv_timeout() with an expired timeout, but
fixing this in this way allows existing logic in resolve_server() to be kept
unchanged.
parent fdf157ab

lib/hostip.c

+4 −0
Original line number Diff line number Diff line
@@ -554,6 +554,10 @@ int Curl_resolv_timeout(struct connectdata *conn, 


  *entry = NULL;



  if(timeoutms < 0)

    /* got an already expired timeout */

    return CURLRESOLV_TIMEDOUT;



#ifdef USE_ALARM_TIMEOUT

  if(data->set.no_signal)

    /* Ignore the timeout when signals are disabled */