Automated merge.

diff --cc ChangeLog
index 8989841447b3d37fd88b89114f348b6b9eeb1974,d96ce3552e28057dadb989f4ae7ce26882d29f72..21d380b261252d9c27b43fe1f9efe87ad89ab99f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,9 +1,17 @@@
+ 2008-06-30  Micah Cowan  <micah@cowan.name>
+ 
+       * NEWS: Entries for 1.11.4.
+ 
+       * AUTHORS: Added Steven Schubiger.
+ 
 +2008-06-26  Xavier Saint  <wget@sxav.eu>
 +
 +      * configure.ac : IRIs support required libiconv, check it.
 +
 +2008-06-14  Xavier Saint  <wget@sxav.eu>
 +
 +      * configure.ac: Add support for IRIs
 +
  2008-05-29  Micah Cowan  <micah@cowan.name>
  
        * po/*.po: Updated from TP (the 1.11.3 set).

diff --cc configure.ac
Simple merge

diff --cc src/ChangeLog
index 7aca052701951708624a479b1f793e21f1dfe1c9,e551f1c9f176313a2c024fe971ded5402c282252..02bc331b8e4a712f29cebce774b0df63a080ff0f
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,19 -1,13 +1,29 @@@
 +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
+       an external file (HTTP/FTP).
+ 
 +2008-06-26  Xavier Saint  <wget@sxav.eu>
 +
 +      * iri.c, iri.h : New functions locale_to_utf8() and
 +      idn_encode() adding basic capabilities of IRI/IDN.
 +
 +      * url.c : Convert URLs from locale to UTF-8 allowing a basic
 +      support of IRI/IDN
 +
+ 2008-06-25  Steven Schubiger  <stsc@members.fsf.org>
+ 
+       * ftp.c (getftp): When spidering a FTP URL, emit a diagnostic
+       message if the remote file exists.
+ 
  2008-06-24  Steven Schubiger  <stsc@members.fsf.org>
  
        * http.c (http_loop): Replace escnonprint() occurence with

diff --cc src/Makefile.am
index 6ae5805d5ba6400354079aa871969c107c72f9f0,6db4ac17da17a995a8961e6afd080df978bc6d36..edbb592e8990422a8ae65d5954fa2c58d7aee599
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -43,10 -40,10 +44,10 @@@ wget_SOURCES = build_info.c cmpt.c conn
               ftp-basic.c ftp-ls.c hash.c host.c html-parse.c html-url.c \
               http.c init.c log.c main.c netrc.c progress.c ptimer.c     \
               recur.c res.c retr.c snprintf.c spider.c url.c             \
 -             utils.c                                    \
 -             css-url.h connect.h convert.h cookies.h \
 +             utils.c $(IRI_OBJ)                                         \
-              connect.h convert.h cookies.h                              \
-              ftp.h gen-md5.h hash.h host.h html-parse.h                 \
-              http.h http-ntlm.h init.h iri.h log.h mswindows.h netrc.h  \
++             css-url.h connect.h convert.h cookies.h                    \
+              ftp.h gen-md5.h hash.h host.h html-parse.h html-url.h      \
+              http.h http-ntlm.h init.h log.h mswindows.h netrc.h        \
               options.h progress.h ptimer.h recur.h res.h retr.h         \
               spider.h ssl.h sysdep.h url.h utils.h wget.h
  nodist_wget_SOURCES = version.c

diff --cc src/html-url.c
index 5a0682d3f80eaab886cdc997fa08ab3c5d26ef54,75bec7d97e7c56709fea35044385480466ea8cfb..ef93a7e49c5c61ded555c2b6c022be3346bbec2c
--- 1/src/html-url.c
--- 2/src/html-url.c
+++ b/src/html-url.c
@@@ -41,11 -41,10 +41,11 @@@ as that of the covered work.  *
  #include "utils.h"
  #include "hash.h"
  #include "convert.h"
- #include "recur.h"              /* declaration of get_urls_html */
+ #include "recur.h"
+ #include "html-url.h"
+ #include "css-url.h"
 +#include "iri.h"
  
- struct map_context;
- 
  typedef void (*tag_handler_t) (int, struct taginfo *, struct map_context *);
  
  #define DECLARE_TAG_HANDLER(fun)                                \

diff --cc src/http.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/recur.c
index 6f5da2ae77b9b33dfa612a10c2e8a847adc47f2f,729a14e91d9cc2e57dbdd54894a954bfcca41d5f..24b80ad475878203680ec355f9ea818758e00b0c
--- 1/src/recur.c
--- 2/src/recur.c
+++ b/src/recur.c
@@@ -48,9 -48,10 +48,11 @@@ as that of the covered work.  *
  #include "hash.h"
  #include "res.h"
  #include "convert.h"
+ #include "html-url.h"
+ #include "css-url.h"
  #include "spider.h"
 -
 +#include "iri.h"
 +\f
  /* Functions for maintaining the URL queue.  */
  
  struct queue_element {
@@@ -59,7 -60,8 +61,9 @@@
    int depth;                    /* the depth */
    bool html_allowed;            /* whether the document is allowed to
                                     be treated as HTML. */
 +  char *remote_encoding;
+   bool css_allowed;             /* whether the document is allowed to
+                                    be treated as CSS. */
    struct queue_element *next;   /* next element in queue */
  };
  
@@@ -92,21 -94,17 +96,23 @@@ url_queue_delete (struct url_queue *que
  
  static void
  url_enqueue (struct url_queue *queue,
-              const char *url, const char *referer, int depth, bool html_allowed)
+              const char *url, const char *referer, int depth,
+              bool html_allowed, bool css_allowed)
  {
    struct queue_element *qel = xnew (struct queue_element);
 +  char *charset = get_current_charset ();
    qel->url = url;
    qel->referer = referer;
    qel->depth = depth;
    qel->html_allowed = html_allowed;
+   qel->css_allowed = css_allowed;
    qel->next = NULL;
  
 +  if (charset)
 +    qel->remote_encoding = xstrdup (charset);
 +  else
 +    qel->remote_encoding = NULL;
 +
    ++queue->count;
    if (queue->count > queue->maxcount)
      queue->maxcount = queue->count;

diff --cc src/retr.c
index dd4978a7acb17297d54b81e51fe4abc50b4f7384,58e00d2fe74102909f78cfdaa57ae5cc7caa304e..7a28ea32e76e825d452417d104fb538a178e79a8
--- 1/src/retr.c
--- 2/src/retr.c
+++ b/src/retr.c
@@@ -51,7 -51,7 +51,8 @@@ as that of the covered work.  *
  #include "hash.h"
  #include "convert.h"
  #include "ptimer.h"
 +#include "iri.h"
+ #include "html-url.h"
  
  /* Total size of downloaded files.  Used to enforce quota.  */
  SUM_SIZE_INT total_downloaded_bytes;
@@@ -780,21 -770,18 +781,31 @@@ retrieve_url (const char *origurl, cha
        goto redirected;
      }
  
 -  if (local_file)
 +  /* Try to not encode in UTF-8 if fetching failed */
 +  if (!(*dt & RETROKF) && get_utf8_encode ())
      {
 +      set_utf8_encode (false);
 +      /*printf ("[Fallbacking to non-utf8 for `%s'\n", url);*/
 +      goto second_try;
 +    }
 +
 +  if (local_file && *dt & RETROKF)
 +    {
 +      register_download (u->url, local_file);
 +      if (redirection_count && 0 != strcmp (origurl, u->url))
 +        register_redirection (origurl, u->url);
 +      if (*dt & TEXTHTML)
 +        register_html (u->url, local_file);
+       if (*dt & RETROKF)
+         {
+           register_download (u->url, local_file);
+           if (redirection_count && 0 != strcmp (origurl, u->url))
+             register_redirection (origurl, u->url);
+           if (*dt & TEXTHTML)
+             register_html (u->url, local_file);
+           if (*dt & TEXTCSS)
+             register_css (u->url, local_file);
+         }
      }
  
    if (file)