[svn] Use the passive FTP transfer mode by default.

NEWS

@@ -25,6 +25,10 @@ where the last attempt left off, and only then continues appending to
 the file.  That way the downloaded file never shrinks, and "start
 over" retries work correctly even when downloading to stdout.
 
+** Passive FTP is now the default FTP transfer mode.  Use
+`--no-passive-ftp' or specify `passive_ftp = off' in your init file to
+revert to the old behavior.
+
 ** The `--header' option can now be used to override generated
 headers.  For example, `wget --header="Host: foo.bar"
 http://127.0.0.1' tells Wget to connect to localhost, but to specify
@@ -54,9 +58,9 @@ have also been changed this way, but they still accept the old syntax
 for backward compatibility.  For example, instead of `--glob=off' you
 can write `--no-glob'.
 
-Allowing `--no-OPTION' for every `--OPTION' is useful because it
+Allowing `--no-OPTION' for every `--OPTION' and the other way around
-allows the user to override non-default behavior specified via
+is useful because it allows the user to override non-default behavior
-`.wgetrc'.
+specified via `.wgetrc'.
 
 ** The new option `--keep-session-cookies' causes `--save-cookies' to
 save session cookies along with the permanent ones.  This is useful on

doc/wget.texi

@@ -177,9 +177,10 @@ download from where it left off.
 @item
 Wget supports proxy servers, which can lighten the network load, speed
 up retrieval and provide access behind firewalls.  However, if you are
-behind a firewall that requires that you use a socks style gateway, you
+behind a firewall that requires that you use a socks style gateway,
-can get the socks library and build Wget with support for socks.  Wget
+you can get the socks library and build Wget with support for socks.
-also supports the passive @sc{ftp} downloading as an option.
+Wget uses the passive @sc{ftp} downloading by default, active @sc{ftp}
+being an option.
 
 @sp 1
 @item
@@ -1264,10 +1265,17 @@ system-specific.  This is why it currently works only with Unix @sc{ftp}
 servers (and the ones emulating Unix @code{ls} output).
 
 @cindex passive ftp
-@item --passive-ftp
+@item --no-passive-ftp
-Use the @dfn{passive} @sc{ftp} retrieval scheme, in which the client
+Disable the use of the @dfn{passive} FTP transfer mode.  Passive FTP
-initiates the data connection.  This is sometimes required for @sc{ftp}
+mandates that the client connect to the server to establish the data
-to work behind firewalls.
+connection rather than the other way around.
+
+If the machine is connected to the Internet directly, both passive and
+active FTP should work equally well.  Behind most firewall and NAT
+configurations passive FTP has a better chance of working.  However,
+in some rare firewall configurations, active FTP actually works when
+passive FTP doesn't.  If you suspect this to be the case, use this
+option, or set @code{passive_ftp=off} in your init file.
 
 @cindex symbolic links, retrieving
 @item --retr-symlinks
@@ -2387,10 +2395,11 @@ Download all ancillary documents necessary for a single @sc{html} page to
 display properly---the same as @samp{-p}.
 
 @item passive_ftp = on/off/always/never
-Set passive @sc{ftp}---the same as @samp{--passive-ftp}.  Some scripts
+Change setting of passive @sc{ftp}, equivalent to the
-and @samp{.pm} (Perl module) files download files using @samp{wget
+@samp{--passive-ftp} option.  Some scripts and @samp{.pm} (Perl
---passive-ftp}.  If your firewall does not allow this, you can set
+module) files download files using @samp{wget --passive-ftp}.  If your
-@samp{passive_ftp = never} to override the command-line.
+firewall does not allow this, you can set @samp{passive_ftp = never}
+to override the command-line.
 
 @item passwd = @var{string}
 Set your @sc{ftp} password to @var{password}.  Without this setting, the

src/ChangeLog

@@ -1,3 +1,7 @@
+2005-03-06  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* init.c (defaults): Use passive FTP by default.
+
 2005-03-06  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* mswindows.c: Provide wrappers to Winsock functions that set

src/init.c

@@ -287,6 +287,7 @@ defaults (void)
   opt.dots_in_line = 50;
 
   opt.dns_cache = 1;
+  opt.ftp_pasv = 1;
 
   /* The default for file name restriction defaults to the OS type. */
 #if !defined(WINDOWS) && !defined(__CYGWIN__)

src/main.c

@@ -555,7 +555,7 @@ FTP options:\n"),
     N_("\
        --no-glob               turn off FTP file name globbing.\n"),
     N_("\
-       --passive-ftp           use the \"passive\" transfer mode.\n"),
+       --no-passive-ftp        disable the \"passive\" transfer mode.\n"),
     N_("\
        --retr-symlinks         when recursing, get linked-to files (not dir).\n"),
     N_("\