45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From ac5ad5214261a2237bdbe344708f9d32c9393fd6 Mon Sep 17 00:00:00 2001
|
|
From: Shohei Maeda <11495867+smaeda-ks@users.noreply.github.com>
|
|
Date: Fri, 12 May 2023 21:06:26 +0900
|
|
Subject: [PATCH] url: fix null dispname for --connect-to option
|
|
|
|
Closes #11106
|
|
|
|
Conflict: context adapt
|
|
Reference: https://github.com/curl/curl/commit/ac5ad5214261a2237bdbe344708f9d32c9393fd6
|
|
---
|
|
lib/url.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/lib/url.c b/lib/url.c
|
|
index 71ca1b64e..de70eee23 100644
|
|
--- a/lib/url.c
|
|
+++ b/lib/url.c
|
|
@@ -1816,11 +1816,6 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
|
|
result = Curl_idnconvert_hostname(data, &conn->host);
|
|
if(result)
|
|
return result;
|
|
- if(conn->bits.conn_to_host) {
|
|
- result = Curl_idnconvert_hostname(data, &conn->conn_to_host);
|
|
- if(result)
|
|
- return result;
|
|
- }
|
|
|
|
#ifndef CURL_DISABLE_HSTS
|
|
/* HSTS upgrade */
|
|
@@ -3480,6 +3475,11 @@ static CURLcode create_conn(struct Curl_easy *data,
|
|
return result;
|
|
}
|
|
#endif
|
|
+ if(conn->bits.conn_to_host) {
|
|
+ result = Curl_idnconvert_hostname(data, &conn->conn_to_host);
|
|
+ if(result)
|
|
+ return result;
|
|
+ }
|
|
|
|
/*************************************************************
|
|
* Check whether the host and the "connect to host" are equal.
|
|
--
|
|
2.33.0
|
|
|