aboutsummaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
authorMichael Kaufmann <mail@michael-kaufmann.ch>2016-01-08 14:54:56 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-01-11 00:11:28 +0100
commit5d7c9379efa635a782d7380b1ef899dc1f7f5b29 (patch)
tree47729695741b5df27922637a71a871e1b2a33be8 /lib/url.c
parent036c465e889d6658cea37a222e65f86dd8f895f7 (diff)
IDN host names: Remove the port number before converting to ACE
Closes #596
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/url.c b/lib/url.c
index 75a1c444b..eaa282a04 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -5652,13 +5652,6 @@ static CURLcode create_conn(struct SessionHandle *data,
conn->bits.tunnel_proxy = TRUE;
/*************************************************************
- * IDN-fix the hostnames
- *************************************************************/
- fix_hostname(data, conn, &conn->host);
- if(conn->proxy.name && *conn->proxy.name)
- fix_hostname(data, conn, &conn->proxy);
-
- /*************************************************************
* Figure out the remote port number and fix it in the URL
*************************************************************/
result = parse_remote_port(data, conn);
@@ -5675,6 +5668,13 @@ static CURLcode create_conn(struct SessionHandle *data,
goto out;
/*************************************************************
+ * IDN-fix the hostnames
+ *************************************************************/
+ fix_hostname(data, conn, &conn->host);
+ if(conn->proxy.name && *conn->proxy.name)
+ fix_hostname(data, conn, &conn->proxy);
+
+ /*************************************************************
* Setup internals depending on protocol. Needs to be done after
* we figured out what/if proxy to use.
*************************************************************/