Automated merge.

diff --cc src/ChangeLog
index 10e80080626d6736eaca65beb2a2c0602ffd02a2,fabc8b8f7e9d8cc66266a1e102dca458b9dc6045..0c60ebfb1869e29ebe6b886e2f2eea47c88be5c1
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,13 -1,10 +1,20 @@@
+ 2009-09-06  Micah Cowan  <micah@cowan.name>
+ 
+       * ftp.c (getftp, ftp_loop_internal): Separate "len" input/output
+       parameter (with different meanings for input and output), into two
+       separate parameters, one input (passed_expected_bytes) and one
+       output (qtyread). Fixes bug #26870.
+ 
 +2009-09-05  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * retr.h: Declare set_local_file() to avoid build warnings.
 +
 +2009-09-05  Gisle Vanem  <gvanem@broadpark.no>
 +
 +      * connect.c, init.c, main.c, openssl.c, options.h:  Replace
 +      "ifdef MSDOS" with "ifdef USE_WATT32" since DOS-targets in fact
 +      use the Watt-32 tcp/ip stack.
 +
  2009-09-04  Micah Cowan  <micah@cowan.name>
  
        * Makefile.am: Move build_info.c to wget_SOURCES from

diff --cc tests/ChangeLog
index f6327b2e3939cf524046a9bc3c14f76d72e79cfb,dcc98e044c9a38cd00f7ec307b29120310e2bee3..a0f5185ae5086ae6b157e6e2e4633ddea4cb91f1
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,26 -1,40 +1,63 @@@
+ 2009-09-06  Micah Cowan  <micah@cowan.name>
+ 
+       * WgetTest.pm.in (_setup): Don't expect error codes from
+       _setup_server; none are returned.
+       (quotechar, _show_diff): Added facilities for expounding on where
+       output didn't match expectations.
+       (_verify_download): Use _show_diff.
+ 
+       * FTPTest.pm (_setup_server): Pass value of server_behavior to
+       FTPServer initialization.
+ 
+       * Test-ftp-pasv-fail.px: Added.
+       * run-px, Makefile.am (EXTRA_DIST): Added Test-ftp-pasv-fail.px.
+ 
+       * WgetTest.pm.in: Added "server_behavior" to the set of accepted
+       initialization values.
+       * FTPServer.pm (__open_data_connection): Add "server_behavior" to
+       the set of accepted initialization values.
+       (run): Honor the 'fail_on_pasv' server behavior setting, to
+       trigger the Wget getftp glitch.
+ 
+ 2009-09-05  Micah Cowan  <micah@cowan.name>
+ 
+       * Test-ftp-recursive.px: Added.
+       * run-px, Makefile.am (EXTRA_DIST): Added Test-ftp-recursive.px.
+ 
+       * FTPTest.pm (_setup_server): Don't construct the "input"
+       directory's contents, just pass the URLs structure to
+       FTPServer->new.
+       * FTPServer.pm: Rewrote portions, so that the server now uses the
+       information from the %urls hash directly, rather than reading from
+       real files. Added an FTPPaths package to the file.
+ 
+ 2009-09-04  Micah Cowan  <micah@cowan.name>
+ 
+       * WgetTest.pm.in (run): Error-checking improvements.
+ 
 +2009-09-05  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * run-px: Introduce two new diagnostics: Skip and Unknown.
 +
 +      * WgetFeature.pm (import): Parse the version output of Wget
 +      and assert the availability of a feature.
 +
 +      * WgetFeature.cfg: Messages to be printed in absence of a
 +      required feature.
 +
 +      * Test-ftp-iri-disabled.px, Test-ftp-iri-fallback.px,
 +      Test-ftp-iri-recursive.px, Test-ftp-iri.px, Test-idn-cmd.px,
 +      Test-idn-headers.px, Test-idn-meta.px, Test-idn-robots.px,
 +      Test-iri-forced-remote.px, Test-iri-list.px,
 +      Test-iri-percent.px, Test-iri.px: Use WgetFeature.pm to
 +      check for the presence of the IDN/IRI feature.
 +
 +      * Test-proxied-https-auth.px: Replace grepping for a feature
 +      with loading WgetFeature.pm at compile-time.
 +
 +      * Makefile.am: Add WgetFeature.pm and WgetFeature.cfg
 +      to EXTRA_DIST.
 +
  2009-09-02  Micah Cowan  <micah@cowan.name>
  
        * Makefile.am (unit-tests): explicit dependency is

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/run-px
Simple merge