IDN host names: Remove the port number before converting to ACE
Closes #596
This commit is contained in:
Родитель
036c465e88
Коммит
5d7c9379ef
14
lib/url.c
14
lib/url.c
|
@ -5651,13 +5651,6 @@ static CURLcode create_conn(struct SessionHandle *data,
|
||||||
if((conn->given->flags&PROTOPT_SSL) && conn->bits.httpproxy)
|
if((conn->given->flags&PROTOPT_SSL) && conn->bits.httpproxy)
|
||||||
conn->bits.tunnel_proxy = TRUE;
|
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
|
* 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)
|
if(result)
|
||||||
goto out;
|
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
|
* Setup internals depending on protocol. Needs to be done after
|
||||||
* we figured out what/if proxy to use.
|
* we figured out what/if proxy to use.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче