[svn] Restructure generation of HTTP requests. Allow headers specified with

[wget] / src / options.h

diff --git a/src/options.h b/src/options.h
index 9df52f0a8aeefa0c8247d4e035e24c5e8091d20d..e6434896ff7fd9600ec39fc091f9e69a3a2981f7 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -96,7 +96,7 @@ struct options
 
   char *http_user;             /* HTTP user. */
   char *http_passwd;           /* HTTP password. */
-  char *user_header;           /* User-defined header(s). */
+  char **user_headers;         /* User-defined header(s). */
   int http_keep_alive;         /* whether we use keep-alive */
 
   int use_proxy;               /* Do we use proxy? */
@@ -119,10 +119,8 @@ struct options
 
   long limit_rate;             /* Limit the download rate to this
                                   many bps. */
-  long quota;                  /* Maximum number of bytes to
-                                  retrieve. */
-  VERY_LONG_TYPE downloaded;   /* How much we downloaded already. */
-  int downloaded_overflow;     /* Whether the above overflowed. */
+  LARGE_INT quota;             /* Maximum file size to download and
+                                  store. */
   int numurls;                 /* Number of successfully downloaded
                                   URLs */
 
@@ -130,9 +128,9 @@ struct options
   int save_headers;            /* Do we save headers together with
                                   file? */
 
-#ifdef DEBUG
+#ifdef ENABLE_DEBUG
   int debug;                   /* Debugging on/off */
-#endif /* DEBUG */
+#endif
 
   int timestamping;            /* Whether to use time-stamping. */
 
@@ -179,9 +177,11 @@ struct options
   int   sslprotocol;           /* 0 = auto / 1 = v2 / 2 = v3 / 3 = TLSv1 */
 #endif /* HAVE_SSL */
 
-  int   cookies;
-  char *cookies_input;
-  char *cookies_output;
+  int   cookies;               /* whether cookies are used. */
+  char *cookies_input;         /* file we're loading the cookies from. */
+  char *cookies_output;                /* file we're saving the cookies to. */
+  int   keep_session_cookies;  /* whether session cookies should be
+                                  saved and loaded. */
 
   char *post_data;             /* POST query string */
   char *post_file_name;                /* File to post */
@@ -196,6 +196,14 @@ struct options
 
   int strict_comments;         /* whether strict SGML comments are
                                   enforced.  */
+
+  int preserve_perm;           /* whether remote permissions are used
+                                 or that what is set by umask. */
+
+#ifdef ENABLE_IPV6
+  int ipv4_only;               /* IPv4 connections have been requested. */
+  int ipv6_only;               /* IPv4 connections have been requested. */
+#endif
 };
 
 extern struct options opt;