From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 23 Apr 2016 20:46:15 +0000 (+0200)
Subject: multi: accidentally used resolved host name instead of proxy
X-Git-Tag: curl-7_49_0~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=439afae886e1019974cd3cd2b169a99cb1f84c35;p=thirdparty%2Fcurl.git

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
---

diff --git a/lib/multi.c b/lib/multi.c
index aec377d96c..1184482f2c 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1466,7 +1466,9 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
       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;
@@ -1480,7 +1482,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
         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)