Commit a464f338 authored by Anders Bakken's avatar Anders Bakken Committed by Daniel Stenberg
Browse files

ConnectionExists: with *PIPEWAIT, wait for connections 

Try harder to prevent libcurl from opening up an additional socket when
CURLOPT_PIPEWAIT is set. Accomplished by letting ongoing TCP and TLS
handshakes complete first before the decision is made.

Closes #575
parent 04cb9094

lib/url.c

+10 −0
Original line number Diff line number Diff line
@@ -3140,6 +3140,7 @@ ConnectionExists(struct SessionHandle *data, 
{

  struct connectdata *check;

  struct connectdata *chosen = 0;

  bool foundPendingCandidate = FALSE;

  bool canPipeline = IsPipeliningPossible(data, needle);

#ifdef USE_NTLM

  bool wantNTLMhttp = ((data->state.authhost.want & CURLAUTH_NTLM) ||
@@ -3239,6 +3240,8 @@ ConnectionExists(struct SessionHandle *data, 


        if((check->sock[FIRSTSOCKET] == CURL_SOCKET_BAD) ||

           check->bits.close) {

          if(!check->bits.close)

            foundPendingCandidate = TRUE;

          /* Don't pick a connection that hasn't connected yet or that is going

             to get closed. */

          infof(data, "Connection #%ld isn't open enough, can't reuse\n",
@@ -3339,6 +3342,7 @@ ConnectionExists(struct SessionHandle *data, 
              continue;

            }

            else if(check->ssl[FIRSTSOCKET].state != ssl_connection_complete) {

              foundPendingCandidate = TRUE;

              DEBUGF(infof(data,

                           "Connection #%ld has not started SSL connect, "

                           "can't reuse\n",
@@ -3447,6 +3451,12 @@ ConnectionExists(struct SessionHandle *data, 
    return TRUE; /* yes, we found one to use! */

  }



  if(foundPendingCandidate && data->set.pipewait) {

    infof(data,

          "Found pending candidate for reuse and CURLOPT_PIPEWAIT is set");

    *waitpipe = TRUE;

  }



  return FALSE; /* no matching connecting exists */

}