From dfb9f95e2cca5bf208b10b2e9a63590d63759bc1 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 23 Apr 2016 22:46:15 +0200 Subject: [PATCH] multi: accidentally used resolved host name instead of proxy Regression introduced in 09b5a998 Bug: https://curl.haxx.se/mail/lib-2016-04/0084.html Reported-by: BoBo --- lib/multi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/multi.c b/lib/multi.c index aec377d..1184482 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -1464,11 +1464,13 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, { struct Curl_dns_entry *dns = NULL; struct connectdata *conn = data->easy_conn; const char *hostname; - if(conn->bits.conn_to_host) + if(conn->bits.proxy) + hostname = conn->proxy.name; + else if(conn->bits.conn_to_host) hostname = conn->conn_to_host.name; else hostname = conn->host.name; /* check if we have the name resolved by now */ @@ -1478,11 +1480,11 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, #ifdef CURLRES_ASYNCH conn->async.dns = dns; conn->async.done = TRUE; #endif result = CURLE_OK; - infof(data, "Hostname was found in DNS cache\n"); + infof(data, "Hostname '%s' was found in DNS cache\n", hostname); } if(!dns) result = Curl_resolver_is_resolved(data->easy_conn, &dns); -- 2.8.1