Commit bd5d21aa authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

When a resolve is made on a pipelined connection we need to detect it properly 

(when the resoling isn't completede yet) and not confuse it with a simple
connection re-use (non-pipelined).
parent 19e07771

lib/url.c

+1 −1
Original line number Diff line number Diff line
@@ -3623,7 +3623,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, 
          conn->connectindex,

          conn->bits.httpproxy?conn->proxy.dispname:conn->host.dispname);

#ifdef CURLRES_ASYNCH

    if(!conn->dns_entry) {

    if(!conn->ip_addr_str) {

      infof(data, "... but it is not resolved yet!\n");

      *async = TRUE;

    }

lib/urldata.h

+2 −1
Original line number Diff line number Diff line
@@ -684,7 +684,8 @@ struct connectdata { 


  /* 'dns_entry' is the particular host we use. This points to an entry in the

     DNS cache and it will not get pruned while locked. It gets unlocked in

     Curl_done() */

     Curl_done(). This entry will be NULL if the connection is re-used as then

     there is no name resolve done. */

  struct Curl_dns_entry *dns_entry;



  /* 'ip_addr' is the particular IP we connected to. It points to a struct