Unverified Commit 54b201b4 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

extract_if_dead: use a known working transfer when checking connections 

Make sure that this function sets a proper "live" transfer for the
connection before calling the protocol-specific connection check
function, and then clear it again afterward as a non-used connection has
no current transfer.

Reported-by: Jeroen Ooms
Reviewed-by: Marcel Raad
Reviewed-by: Daniel Gustafsson
Fixes #3463
Closes #3464
parent cf8c7059

lib/url.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -965,8 +965,9 @@ static bool extract_if_dead(struct connectdata *conn, 
      /* The protocol has a special method for checking the state of the

      /* The protocol has a special method for checking the state of the

         connection. Use it to check if the connection is dead. */

         connection. Use it to check if the connection is dead. */

      unsigned int state;

      unsigned int state;



      conn->data = data; /* temporary transfer for this connection to use */

      state = conn->handler->connection_check(conn, CONNCHECK_ISDEAD);

      state = conn->handler->connection_check(conn, CONNCHECK_ISDEAD);

      conn->data = NULL; /* clear transfer again */

      dead = (state & CONNRESULT_DEAD);

      dead = (state & CONNRESULT_DEAD);

    }

    }

    else {

    else {
@@ -3773,7 +3774,6 @@ static CURLcode create_conn(struct Curl_easy *data, 




    /* Setup a "faked" transfer that'll do nothing */

    /* Setup a "faked" transfer that'll do nothing */

    if(!result) {

    if(!result) {

      conn->data = data;

      conn->bits.tcpconnect[FIRSTSOCKET] = TRUE; /* we are "connected */

      conn->bits.tcpconnect[FIRSTSOCKET] = TRUE; /* we are "connected */





      result = Curl_conncache_add_conn(data->state.conn_cache, conn);

      result = Curl_conncache_add_conn(data->state.conn_cache, conn);