diff options
author | Thomas E. Dickey <dickey@invisible-island.net> | 2012-02-23 00:42:23 -0500 |
---|---|---|
committer | Thomas E. Dickey <dickey@invisible-island.net> | 2012-02-23 00:42:23 -0500 |
commit | fde4be86f4d67d01a51f881159d190002d0bd810 (patch) | |
tree | 375de4d45fee53daa9cb5f51a5c3b03a910975c0 /WWW | |
parent | bc0fa578036583231edb567b328b4f69ce6860fe (diff) | |
download | lynx-snapshots-fde4be86f4d67d01a51f881159d190002d0bd810.tar.gz |
snapshot of project "lynx", label v2-8-8dev_11a
Diffstat (limited to 'WWW')
-rw-r--r-- | WWW/Library/Implementation/HTAccess.c | 4 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTTP.h | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c index 2b287e9d..5bfcce4e 100644 --- a/WWW/Library/Implementation/HTAccess.c +++ b/WWW/Library/Implementation/HTAccess.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTAccess.c,v 1.76 2012/02/04 00:15:53 tom Exp $ + * $LynxId: HTAccess.c,v 1.77 2012/02/23 00:39:40 tom Exp $ * * Access Manager HTAccess.c * ============== @@ -895,7 +895,7 @@ static BOOL HTLoadDocument(const char *full_address, /* may include #fragment */ * based on an If-Modified-Since check, etc.) but the code for doing * those other things isn't available yet. */ - if (!reloading && + if ((reloading != REAL_RELOAD) && (LYoverride_no_cache || #ifdef DONT_TRACK_INTERNAL_LINKS !HText_hasNoCacheSet(text) || diff --git a/WWW/Library/Implementation/HTTP.h b/WWW/Library/Implementation/HTTP.h index f10c2fce..f3ab7eb1 100644 --- a/WWW/Library/Implementation/HTTP.h +++ b/WWW/Library/Implementation/HTTP.h @@ -1,5 +1,5 @@ /* - * $LynxId: HTTP.h,v 1.10 2009/04/07 22:44:50 tom Exp $ + * $LynxId: HTTP.h,v 1.11 2012/02/23 00:41:07 tom Exp $ * * /Net/dxcern/userd/timbl/hypertext/WWW/Library/Implementation/HTTP.html * HYPERTEXT TRANFER PROTOCOL @@ -25,6 +25,12 @@ extern "C" { #define URL_POST_METHOD 2 #define URL_MAIL_METHOD 3 + /* + * Special value for 'reloading' used to tell HTLoadDocument() that the + * user asked for a reload, versus Lynx doing a reload for other reasons. + */ +#define REAL_RELOAD (TRUE + 1) + extern int ws_read_per_sec; extern BOOLEAN reloading; extern char *redirecting_url; |