summaryrefslogtreecommitdiff
path: root/lib/multi.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-04-23 22:46:15 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-04-25 23:31:55 +0200
commit439afae886e1019974cd3cd2b169a99cb1f84c35 (patch)
tree60350dc8731b4ffbadc7025164fe7f855891f661 /lib/multi.c
parenteafd9264aa12d9fc87615373453587a27ccdba9f (diff)
downloadgnurl-439afae886e1019974cd3cd2b169a99cb1f84c35.tar.gz
gnurl-439afae886e1019974cd3cd2b169a99cb1f84c35.tar.bz2
gnurl-439afae886e1019974cd3cd2b169a99cb1f84c35.zip
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
Diffstat (limited to 'lib/multi.c')
-rw-r--r--lib/multi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/multi.c b/lib/multi.c
index aec377d96..1184482f2 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)