Merge with mainline.

diff --cc ChangeLog
Simple merge

diff --cc doc/ChangeLog
index 94a06283119c70de05857d0b2064a43ad83c6e01,a879fcb830a29bb96fe9cefe37b7ce195d50c1c3..02eb44e5f35e8d7187ff9e506314b4e14e118714
--- 1/doc/ChangeLog
--- 2/doc/ChangeLog
+++ b/doc/ChangeLog
@@@ -1,12 -1,39 +1,48 @@@
+ 2008-11-10  Micah Cowan  <micah@cowan.name>
+ 
+       * Makefile.am (EXTRA_DIST): Removed no-longer-present
+       README.maint (shouldn't have been there in the first place).
+ 
+       * wget.texi (Mailing Lists): Added information aboug Gmane portal,
+       added subsection headings.
+ 
+       Update node pointers.
+       
+ 2008-11-05  Micah Cowan  <micah@cowan.name>
+ 
+       * wget.texi: Move --no-http-keep-alive from FTP Options to HTTP
+       Options.
+       (Mailing List): Mention moderation for unsubscribed posts, and
+       archive location.
+ 
+ 2008-11-04  Micah Cowan  <micah@cowan.name>
+ 
+       * wget.texi, fdl.texi: Updated to FDL version 1.3.
+ 
+ 2008-10-31  Micah Cowan  <micah@cowan.name>
+ 
+       * wget.texi (Mailing List): Update info to reflect change to
+       bug-wget@gnu.org.
+ 
+ 2008-09-30  Steven Schubiger  <stsc@members.fsf.org>
+ 
+       * wget.texi (Wgetrc Commands): Add default_page, save_headers, 
+       spider and user_agent to the list of recognized commands.
+ 
+ 2008-09-10  Michael Kessler  <kessler.michael@aon.at>
+ 
+       * wget.texi (Robot Exclusion): Fixed typo "downloads" ->
+       "download"
+ 
 +2008-08-03  Xavier Saint  <wget@sxav.eu>
 +
 +      * wget.texi : Add option descriptions for the three new
 +      options --iri, --locale and --remote-encoding related to
 +      IRI support.
 +
 +      * sample.wgetrc : Add commented lines for the three new
 +      command iri, locale and encoding related to IRI support.
 +
  2008-08-03  Micah Cowan  <micah@cowan.name>
  
        * wget.texi: Don't set UPDATED; already set by version.texi.

diff --cc doc/wget.texi
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/build_info.c
Simple merge

diff --cc src/http.c
Simple merge

diff --cc src/init.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/retr.c
Simple merge

diff --cc src/url.c
Simple merge

diff --cc src/url.h
index 0748e214acec8dc3419b291a77cf0c8b9c124866,f523e2efd3229104515e4825b29e0559c83503fc..badd92522b90fc39e2b956fd111be9497a431d78
--- 1/src/url.h
--- 2/src/url.h
+++ b/src/url.h
@@@ -83,8 -83,9 +83,9 @@@ struct ur
  /* Function declarations */
  
  char *url_escape (const char *);
+ char *url_escape_unsafe_and_reserved (const char *);
  
 -struct url *url_parse (const char *, int *);
 +struct url *url_parse (const char *, int *, struct iri *iri);
  char *url_error (const char *, int);
  char *url_full_path (const struct url *);
  void url_set_dir (struct url *, const char *);

diff --cc tests/ChangeLog
index 7751be64bd15dfba3d5f5cb946f795516a35765a,4c1b7de7fb1224167aab697747c474e86e2c63ab..25f2ab40997a83e330d221e7168f2c94562c6969
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,48 -1,66 +1,111 @@@
+ 2008-11-12  Steven Schubiger  <stsc@members.fsf.org>
+ 
+       * Test-auth-basic.px, Test-auth-no-challenge.px,
+       Test-auth-no-challenge-url.px, Test-c-full.px,
+       Test-c-partial.px, Test-c.px, Test-c-shorter.px,
+       Test-E-k-K.px, Test-E-k.px, Test-ftp.px, 
+       Test-HTTP-Content-Disposition-1.px, 
+       Test-HTTP-Content-Disposition-2.px,
+       Test-HTTP-Content-Disposition.px, Test-N-current.px,
+       Test-N-HTTP-Content-Disposition.px,
+       Test-N--no-content-disposition.px,
+       Test-N--no-content-disposition-trivial.px,
+       Test-N-no-info.px, Test--no-content-disposition.px,
+       Test--no-content-disposition-trivial.px, Test-N-old.px,
+       Test-nonexisting-quiet.px, Test-noop.px, Test-np.px,
+       Test-N.px, Test-N-smaller.px, 
+       Test-O-HTTP-Content-Disposition.px, Test-O-nc.px,
+       Test-O--no-content-disposition.px, 
+       Test-O--no-content-disposition-trivial.px,
+       Test-O-nonexisting.px, Test-O.px,
+       Test-proxy-auth-basic.px, Test-Restrict-Lowercase.px,
+       Test-Restrict-Uppercase.px,
+       Test--spider-fail.pxm, Test--spider.px,
+       Test--spider-r-HTTP-Content-Disposition.px,
+       Test--spider-r--no-content-disposition.px,
+       Test--spider-r--no-content-disposition-trivial.px,
+       Test--spider-r.px: Enforce lexically scoped warnings.
+ 
+       * Test-proxied-https-auth.px, run-px: Place use strict
+       before use warnings.
+ 
+ 2008-11-12  Steven Schubiger  <stsc@members.fsf.org>
+ 
+       * FTPServer.pm, FTPTest.pm, HTTPServer.pm, HTTPTest.pm:
+       Remove the magic interpreter line, because it cannot be
+       used fully. Substitute -w with use warnings.
+ 
+ 2008-11-11  Micah Cowan  <micah@cowan.name>
+ 
+       * HTTPServer.pm (handle_auth): Allow testing of
+       --auth-no-challenge.
+ 
+       * Test-auth-no-challenge.px, Test-auth-no-challenge-url.px:
+       Added.
+ 
+       * run-px: Add Test-auth-no-challenge.px,
+       Test-auth-no-challenge-url.px.
+ 
+ 2008-11-07  Steven Schubiger  <stsc@members.fsf.org>
+ 
+       * run-px: Use some colors for the summary part of the test
+       output to strengthen the distinction between a successful
+       or failing run.
+ 
+ 2008-11-06  Steven Schubiger  <stsc@members.fsf.org>
+ 
+       * run-px: When executing test scripts, invoke them with the
+       current perl executable name as determined by env.
+ 
+ 2008-11-06  Micah Cowan  <micah@cowan.name>
+ 
+       * run-px: Use strict (thanks Steven Schubiger!).
+ 
 +2008-09-09  Micah Cowan  <micah@cowan.name>
 +
 +      * Test-idn-cmd.px: Added.
 +
 +      * run-px: Added Test-idn-cmd.px.
 +
 +2008-08-28  Micah Cowan  <micah@cowan.name>
 +
 +      * HTTPServer.pm (run): Allow distinguishing between hostnames,
 +      when used as a proxy.
 +
 +      * Test-idn-headers.px, Test-idn-meta.px: Added.
 +
 +      * run-px: Added Test-idn-headers.px, Test-idn-meta.px.
 +
 +      * Test-proxy-auth-basic.px: Use the full URL, rather than just the
 +      path (made necessary by the accompanying change to HTTPServer.pm).
 +
 +2008-08-14  Xavier Saint <wget@sxav.eu>
 +      
 +      * Test-iri-list.px : Fetch files from a remote list.
 +
 +2008-08-03  Xavier Saint <wget@sxav.eu>
 +
 +      * Test-iri.px : HTTP recursive fetch for testing IRI support and
 +      fallback.
 +
 +      * Test-iri-disabled.px : Same file structure as Test-iri.px but with
 +      IRI support disabled
 +
 +      * Test-iri-forced-remote.px : There's a difference between ISO-8859-1
 +      and ISO-8859-15 for character 0xA4 (respectively currency sign and
 +      euro sign). So with a forced ISO-8859-1 remote encoding, wget should
 +      see 0xA4 as a currency sign and transcode it correctly in UTF-8 instead
 +      of using the ISO-8859-15 given by the server.
 +
 +      * Test-ftp-iri.px : Give a file to fetch via FTP in a specific locale
 +      and expect wget to fetch the file UTF-8 encoded.
 +
 +      * Test-ftp-iri-fallback.px : Same as above but wget should fallback on
 +      locale encoding to fetch the file.
 +
 +      * Test-ftp-iri.px : Same as Test-ftp-iri.px but with IRI support
 +      disabled. The UTF-8 encoded file should not be retrieved.
 +
  2008-06-22  Micah Cowan  <micah@cowan.name>
  
        * Test-proxied-https-auth.px: Shift exit code so it falls in the

diff --cc tests/HTTPServer.pm
Simple merge

diff --cc tests/Test-proxy-auth-basic.px
Simple merge

diff --cc tests/run-px
Simple merge