1 diff -urN wget-1.9.1/src/cookies.c wget-1.9.1-nonperm/src/cookies.c
2 --- wget-1.9.1/src/cookies.c 2003-10-07 12:39:18.000000000 +0200
3 +++ wget-1.9.1-nonperm/src/cookies.c 2004-05-07 14:51:38.690337912 +0200
4 @@ -1357,14 +1357,12 @@
7 sscanf (expires_b, "%lf", &expiry);
8 - if (expiry < cookies_now)
9 + if ( expiry < cookies_now && !opt.cookies_nonperm)
10 /* ignore stale cookie. */
12 cookie->expiry_time = expiry;
14 - /* If the cookie has survived being saved into an external file,
15 - it is obviously permanent. */
16 - cookie->permanent = 1;
17 + cookie->permanent = (opt.cookies_nonperm && expiry < cookies_now) ? 0 : 1 ;
19 store_cookie (jar, cookie);
22 struct cookie *cookie = (struct cookie *)value;
23 for (; cookie; cookie = cookie->next)
25 - if (!cookie->permanent)
26 + if (!cookie->permanent && !opt.cookies_nonperm)
28 if (COOKIE_EXPIRED_P (cookie))
30 diff -urN wget-1.9.1/src/init.c wget-1.9.1-nonperm/src/init.c
31 --- wget-1.9.1/src/init.c 2004-05-07 14:58:12.331495360 +0200
32 +++ wget-1.9.1-nonperm/src/init.c 2004-05-07 14:52:20.800936128 +0200
34 { "continue", &opt.always_rest, cmd_boolean },
35 { "convertlinks", &opt.convert_links, cmd_boolean },
36 { "cookies", &opt.cookies, cmd_boolean },
37 + { "cookiesnonperm", &opt.cookies_nonperm, cmd_boolean },
38 { "cutdirs", &opt.cut_dirs, cmd_number },
40 { "debug", &opt.debug, cmd_boolean },
41 diff -urN wget-1.9.1/src/main.c wget-1.9.1-nonperm/src/main.c
42 --- wget-1.9.1/src/main.c 2004-05-07 14:58:12.285502352 +0200
43 +++ wget-1.9.1-nonperm/src/main.c 2004-05-07 14:40:25.103738640 +0200
45 --cookies=off don't use cookies.\n\
46 --load-cookies=FILE load cookies from FILE before session.\n\
47 --save-cookies=FILE save cookies to FILE after session.\n\
48 + --cookies-nonperm save and load even non-permanent cookies.\n\
49 --post-data=STRING use the POST method; send STRING as the data.\n\
50 --post-file=FILE use the POST method; send contents of FILE.\n\
53 { "retr-symlinks", no_argument, NULL, 137 },
54 { "retry-connrefused", no_argument, NULL, 174 },
55 { "save-headers", no_argument, NULL, 's' },
56 + { "cookies-nonperm", no_argument, NULL, 154 },
57 { "server-response", no_argument, NULL, 'S' },
58 { "span-hosts", no_argument, NULL, 'H' },
59 { "spider", no_argument, NULL, 132 },
62 setoptval ("strictcomments", "on");
65 + setoptval ("cookiesnonperm", "on");
68 /* Options accepting an argument: */
70 diff -urN wget-1.9.1/src/options.h wget-1.9.1-nonperm/src/options.h
71 --- wget-1.9.1/src/options.h 2003-10-11 15:57:11.000000000 +0200
72 +++ wget-1.9.1-nonperm/src/options.h 2004-05-07 01:20:22.933299816 +0200
77 + int cookies_nonperm;
79 char *post_data; /* POST query string */
80 char *post_file_name; /* File to post */