From 5d7c9379efa635a782d7380b1ef899dc1f7f5b29 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 8 Jan 2016 14:54:56 +0100 Subject: [PATCH] IDN host names: Remove the port number before converting to ACE Closes #596 --- lib/url.c | 14 +++++++------- 1 file 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 @@ -5651,13 +5651,6 @@ static CURLcode create_conn(struct SessionHandle *data, if((conn->given->flags&PROTOPT_SSL) && conn->bits.httpproxy) 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 *************************************************************/ @@ -5674,6 +5667,13 @@ static CURLcode create_conn(struct SessionHandle *data, if(result) 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.