[svn] Fix for #20659 - Content-Disposition off by default.

diff --git a/ChangeLog b/ChangeLog
index 075d7ca588dc94484212711b3c108cd2609600c1..6d9a5ac33ffa78edcf1af0d6550cc6ffde5798e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-08  Micah Cowan  <micah@cowan.name>
+
+       * NEWS: Call attention to the fact that Content-Disposition is
+       not enabled by default.
+
 2007-08-07  Micah Cowan  <micah@cowan.name>
 
        * configure.in: Fix --with-libssl-prefix failure by replacing

diff --git a/NEWS b/NEWS
index 3b49ca884cbb08fc7fa284378911c51b32f4577d..41cc5c0e54a2e4927e522c1be1c2f4f9e5b7bd5b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,8 +24,11 @@ automatically, and continue to require a challenge for each resource.
 be the maximum number of HTTP redirects to follow.
 
 ** Wget now saves HTTP downloads using file names specified by the
-`Content-Disposition' header.  This is a standard way of specifying
-the file name used by many web dynamically generated pages.
+`Content-Disposition' header.  This is a standard way of specifying the
+file name used by many web dynamically generated pages. For the time
+being, Content-Disposition is not used by default, to avoid the extra
+round-trips incurred (must specify "-e contentdisposition=yes"); this
+may change in a future version.
 
 ** The GnuTLS library is now also supported for https downloads.
 This is still work-in-progress.  OpenSSL is still used by default; use

diff --git a/src/ChangeLog b/src/ChangeLog
index ee120fc0c2c03cb38ba08b2fb07c1a7e2fcbafd3..0ef8b83d9bf0893d3af0b96f5adcc1c572a46573 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-08  Micah Cowan  <micah@cowan.name>
+
+       * init.c (defaults): Content disposition will not be default,
+       since it currently results in extra round-trips.
+
 2007-07-31  Micah Cowan  <micah@cowan.name>
 
        * http.c (gethttp): Set contlen = -1 when we encounter a

diff --git a/src/init.c b/src/init.c
index 8989a0e06f58fdabb56eae179d9254540f75d9f1..7d861922741ecef84eb62c0d4a07ee99b5564084 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -321,7 +321,6 @@ defaults (void)
   opt.restrict_files_ctrl = true;
   opt.restrict_files_case = restrict_no_case_restriction;
 
-  opt.content_disposition = true;
   opt.max_redirect = 20;
 }
 \f