Commit 5d7c9379 authored by Michael Kaufmann's avatar Michael Kaufmann Committed by Daniel Stenberg
Browse files

IDN host names: Remove the port number before converting to ACE 

Closes #596
parent 036c465e

lib/url.c

+7 −7
Original line number Diff line number Diff line
@@ -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.