Automated merge.

diff --cc src/ChangeLog
index 3e08d0d86722e12b67c0f9209331c53d335f86cc,02bc331b8e4a712f29cebce774b0df63a080ff0f..fd86c51caf62ce6a9dfd86e9ef3cb2fe27a860c6
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,12 -1,11 +1,20 @@@
 +2008-07-17  Steven Schubiger  <stsc@members.fsf.org>
 +
 +      * retr.c (retrieve_from_file): When given an URL as input file,
 +      use it as baseref if none was specified and treat the input file
 +      as HTML if its content type is text/html.
 +
 +      * init.c (cleanup): Free the memory associated with the base
 +      option (when DEBUG_MALLOC is defined).
 +
+ 2008-07-02  Xavier Saint  <wget@sxav.eu>
+ 
+       * iri.c, iri.h  : New function idn_decode() to decode ASCII
+       encoded hostname to the locale.
+ 
+       * host.c : Show hostname to be resolved both in locale and
+       ASCII encoded.
+ 
  2008-06-28  Steven Schubiger  <stsc@members.fsf.org>
  
        * retr.c (retrieve_from_file): Allow for reading the links from

diff --cc src/init.c
Simple merge

diff --cc src/retr.c
index 0fc468377ab0d4f91abe8af6980882bea1505baa,e70f6e6e5433e02a88d1024e270e9347bbcad909..ae8ef3ef1f772366efd446311cccf446b2168a64
--- 1/src/retr.c
--- 2/src/retr.c
+++ b/src/retr.c
@@@ -827,21 -855,16 +855,24 @@@ retrieve_from_file (const char *file, b
  
    status = RETROK;             /* Suppose everything is OK.  */
    *count = 0;                  /* Reset the URL count.  */
-   
+ 
+   /* sXXXav : Assume filename and links in the file are in the locale */
+   set_content_encoding (iri, opt.locale);
+ 
    if (url_has_scheme (url))
      {
 +      int dt;
        uerr_t status;
 -      status = retrieve_url (url, &input_file, NULL, NULL, NULL, false, iri);
 +
 +      if (!opt.base_href)
 +        opt.base_href = xstrdup (url);
 +
-       status = retrieve_url (url, &input_file, NULL, NULL, &dt, false);
++      status = retrieve_url (url, &input_file, NULL, NULL, &dt, false, iri);
        if (status != RETROK)
          return status;
 +
 +      if (dt & TEXTHTML)
 +        html = true;
      }
    else
      input_file = (char *) file;