Merge in gerel's url-parsing stuff.

diff --cc src/ChangeLog
index 0a80c8c37b6d38c32c7babb80671b80233abdcd5,5eb9985e798c68620ac1518c39bf0f7436b9077e..58e44a87ae34ae5257eed557094ec901bdb2763f
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,94 -1,8 +1,99 @@@
 +2009-06-12  Micah Cowan  <micah@cowan.name>
 +
 +      * host.c: Include <sys/types.h> before <sys/socket.h>. Not
 +      required by POSIX any more, but some older systems (such as
 +      FreeBSD 4.1) still need it, and it doesn't seem like it could
 +      hurt...
 +
 +      * build_info.c (library): Handle "https" as a feature in its own
 +      right, apart from "gnutls" and "openssl".
 +
 +      * host.c: Declare h_errno if no declaration is provided. Idea
 +      thanks to Maciej W. Rozycki.
 +
 +2009-06-11  Xin Zou  <zouxin2008@gmail.com>   
 +      
 +      * http.c (gethttp): Fix some memory leaks.
 +      
 +2009-06-11  Micah Cowan  <micah@cowan.name>
 +
 +      * http.c (http_atotm): Handle potential for setlocale's return
 +      value to be static storage. Thanks to Benjamin Wolsey
 +      <bwy@benjaminwolsey.de>.
 +
 +      * sysdep.h: Need NAMESPACE_TWEAKS on non-Linux glibc-based
 +      systems, too. Thanks to Robert Millan.
 +
 +2009-05-28  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * ftp.c (ftp_get_listing): Update the "listing file" 
 +      string after calling ftp_loop_internal().
 +
 +2009-05-27  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * ftp.c (ftp_get_listing): Duplicate the "listing file"
 +      string to avoid memory corruption when FOPEN_EXCL_ERR is
 +      encountered.
 +
 +2009-05-17  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * progress.c (eta_to_human_short): Fix the remaining hours
 +      to be displayed. Spotted by Tadeu Martins (#26411).
 +
 +2009-04-24  Micah Cowan  <micah@cowan.name>
 +
 +      * hash.c: Change stdint.h inclusion to use HAVE_STDINT_H, not C99
 +      check.
 +
 +      * connect.c: stdint.h inclusion added.
 +
 +      Thanks to Markus Duft <mduft@gentoo.org> for a similar patch.
 +      
 +2009-04-20  Micah Cowan  <micah@cowan.name>
 +
 +      * Makefile.am (version.c): Fix unportable use of "echo -n".
 +
 +2009-04-13  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * ftp.c (ftp_retrieve_list): Move the duplicated code that
 +      determines the local file to a function.
 +      
 +      * http.c (http_loop): Likewise.
 +
 +      * retr.c (set_local_file): New function.
 +
 +2009-04-11  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * init.c (initialize): Run a custom SYSTEM_WGETRC when 
 +      provided as an environment variable.
 +
 +2009-02-27  Gisle Vanem  <gvanem@broadpark.no>
 +
 +      * main.c (main): "freopen (NULL,.." causes an assertion in MSVC
 +      debug-mode.  I.e. NULL isn't legal. But the "CONOUT$" device works
 +      fine.
 +
 +2009-02-27  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * ftp.c (ftp_loop_internal): Don't claim for FTP retrievals
 +      when writing to standard output either that the document
 +      has been saved. Addresses bug #20520 again.
 +
 +2009-02-21  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * http.c (http_loop): When a document is written to 
 +      standard output, don't claim it has been saved to a file.
 +      Addresses bug #20520.
 +
 +2009-02-18  Steven Schubiger  <stsc@members.fsf.org>
 +
 +      * recur.h: Remove the dangling declaration for recursive_cleanup().
 +
+ 2009-02-01  Gerardo E. Gidoni  <gerel@gnu.org>
+ 
+       * main.c, recur.c, recur.h, res.c, retr.c, retr.h: restructured code to
+       avoid multiple 'url_parse' calls.
+ 
  2008-11-13  Micah Cowan  <micah@cowan.name>
  
        * http.c (gethttp): Don't do anything when content-length >= our

diff --cc src/main.c
Simple merge

diff --cc src/recur.h
Simple merge

diff --cc src/retr.c
Simple merge