[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / options.h

diff --git a/src/options.h b/src/options.h
index 8d57d46325e54962c47bf2c76d2c14779860c98a..0267e37668c0e08c89274f67888c53e056da2677 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -1,11 +1,11 @@
 /* struct options.
-   Copyright (C) 1996-2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
@@ -35,9 +34,6 @@ struct options
   int ntry;                    /* Number of tries per URL */
   bool retry_connrefused;      /* Treat CONNREFUSED as non-fatal. */
   bool background;             /* Whether we should work in background. */
-  bool kill_longer;            /* Do we reject messages with *more*
-                                  data than specified in
-                                  content-length? */
   bool ignore_length;          /* Do we heed content-length at all?  */
   bool recursive;              /* Are we recursive? */
   bool spanhost;                       /* Do we span across hosts in
@@ -206,6 +202,11 @@ struct options
   bool restrict_files_ctrl;    /* non-zero if control chars in URLs
                                   are restricted from appearing in
                                   generated file names. */
+  enum {
+    restrict_no_case_restriction,
+    restrict_lowercase,
+    restrict_uppercase
+  } restrict_files_case;       /* file name case restriction. */
 
   bool strict_comments;                /* whether strict SGML comments are
                                   enforced.  */
@@ -223,6 +224,8 @@ struct options
     prefer_none
   } prefer_family;             /* preferred address family when more
                                   than one type is available */
+  
+  bool content_disposition;    /* Honor HTTP Content-Disposition header. */
 };
 
 extern struct options opt;