diff options
| -rw-r--r-- | CHANGES | 10 | ||||
| -rw-r--r-- | INSTALLATION | 7 | ||||
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTAccess.c | 15 | ||||
| -rwxr-xr-x | scripts/cfg2html.pl | 20 |
5 files changed, 34 insertions, 28 deletions
diff --git a/CHANGES b/CHANGES index 382c9ff8..e611a253 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,15 @@ --- $LynxId: CHANGES,v 1.565 2012/02/03 01:47:08 tom Exp $ +-- $LynxId: CHANGES,v 1.568 2012/02/04 00:56:27 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2012-02-02 (2.8.8dev.10) +2012-02-03 (2.8.8dev.10) +* modify cfg2html.pl to handle options which contain a digit, e.g., + HTML5_CHARSETS whose default value was not marked properly -TD +* modify HTLoadDocument() to not retain a cached document if user is explicitly + doing a refresh. This fixes the case for a #fragment url, which was + otherwise treated as the same as the address without the #fragment -TD +* clarify version of GPL used in README (request by Paul Menzel) -TD * modify HTLoad() to discard charset information before reloading a document, in case the server changes the content-type information between loads (report by Stanislav Brabec) -TD diff --git a/INSTALLATION b/INSTALLATION index cef6461d..3dcc566d 100644 --- a/INSTALLATION +++ b/INSTALLATION @@ -1167,9 +1167,8 @@ V. Compile instructions -- 386 DOS Compile or place your compiled PDCurses library in /djgpp/pdcur26, and compile or place your compiled WATT-32 library in /djgpp/watt32. If using the SLANG library, put libslang.a in your DJGPP/lib directory and put - slang.h and slcurses.h in your DJGPP/include directory, or in the - appropriate directories specified by LIBRARY_PATH and INCLUDE_PATH in your - DJGPP.ENV file. + slang.h in your DJGPP/include directory, or in the appropriate directories + specified by LIBRARY_PATH and INCLUDE_PATH in your DJGPP.ENV file. Move to the "lynx2-*/WWW/Library/djgpp" directory. If compiling with PDCurses, do "make". If using SLANG, do "make -f makefile.sla". This @@ -1388,4 +1387,4 @@ VIII. Acknowledgment -- 1999/04/24 - H. Nelson <lynx-admin@irm.nara.kindai.ac.jp> -- vile:txtmode --- $LynxId: INSTALLATION,v 1.116 2011/05/28 13:07:55 tom Exp $ +-- $LynxId: INSTALLATION,v 1.117 2012/02/03 22:29:17 tom Exp $ diff --git a/README b/README index 563cc159..739dc5cb 100644 --- a/README +++ b/README @@ -42,11 +42,11 @@ HOW TO GET LYNX LICENSE - Lynx is distributed under the GNU General Public License (GPL) without - restrictions on usage or redistribution. The Lynx copyright statement, - "COPYHEADER", and GNU GPL, "COPYING", are included in the top-level - directory of the distribution. Lynx is supported by the Lynx user - community, an entirely volunteer (and unofficial) organization. + Lynx is distributed under the GNU General Public License, version 2 (GPLv2) + without restrictions on usage or redistribution. The Lynx copyright + statement, "COPYHEADER", and GNU GPL, "COPYING", are included in the + top-level directory of the distribution. Lynx is supported by the Lynx + user community, an entirely volunteer (and unofficial) organization. Certain portions of the Lynx source distribution were originally created by CERN and have been modified during the development of diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c index 7587aa49..2b287e9d 100644 --- a/WWW/Library/Implementation/HTAccess.c +++ b/WWW/Library/Implementation/HTAccess.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTAccess.c,v 1.75 2012/02/03 01:43:58 tom Exp $ + * $LynxId: HTAccess.c,v 1.76 2012/02/04 00:15:53 tom Exp $ * * Access Manager HTAccess.c * ============== @@ -895,15 +895,16 @@ 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 (LYoverride_no_cache || + if (!reloading && + (LYoverride_no_cache || #ifdef DONT_TRACK_INTERNAL_LINKS - !HText_hasNoCacheSet(text) || - !HText_AreDifferent(anchor, full_address) + !HText_hasNoCacheSet(text) || + !HText_AreDifferent(anchor, full_address) #else - ((LYinternal_flag || !HText_hasNoCacheSet(text)) && - !isLYNXIMGMAP(full_address)) + ((LYinternal_flag || !HText_hasNoCacheSet(text)) && + !isLYNXIMGMAP(full_address)) #endif /* TRACK_INTERNAL_LINKS */ - ) { + )) { CTRACE((tfp, "HTAccess: Document already in memory.\n")); HText_select(text); diff --git a/scripts/cfg2html.pl b/scripts/cfg2html.pl index 41082343..78d6e421 100755 --- a/scripts/cfg2html.pl +++ b/scripts/cfg2html.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# $LynxId: cfg2html.pl,v 1.15 2011/06/12 18:40:16 tom Exp $ +# $LynxId: cfg2html.pl,v 1.16 2012/02/04 00:54:50 tom Exp $ # # This script uses embedded formatting directives in the lynx.cfg file to # guide it in extracting comments and related information to construct a @@ -47,7 +47,7 @@ if ( defined $opt_m ) { %settings_avail = (); foreach $l (@settings_) { chop $l; - if ($l =~ /^[a-zA-Z_][a-zA-Z_0-9]*$/) { + if ($l =~ /^[[:alpha:]_][[:alnum:]_]*$/) { $settings_avail{uc $l} = 1; } } @@ -125,7 +125,7 @@ sub gen_alphatoc { EOF $m=0; for $n (0..$#input) { - if ( $input[$n] =~ /^\.h2\s*[A-Z][A-Z0-9_]*$/ ) { + if ( $input[$n] =~ /^\.h2\s*[[:upper:]][[:upper:][:digit:]_]*$/ ) { $minor[$m] = $input[$n]; $minor[$m] =~ s/^.h2\s*//; $m++ if (ok($minor[$m]) || defined $opt_a); @@ -240,8 +240,8 @@ EOF next; } elsif ( $c =~ /^\./ ) { my $s = $c; - $s =~ s/^\.[a-z]+\s//; - if ( $s =~ /^[0-9]+$/ ) { + $s =~ s/^\.[[:lower:]]+\s//; + if ( $s =~ /^[[:digit:]]+$/ ) { $count = $s; $once = $s; } @@ -284,7 +284,7 @@ EOF } $m = 0; $first = 1; - } elsif ( $c =~ /^[#A-Za-z]/ && $m != 0 ) { + } elsif ( $c =~ /^[#[:alpha:]]/ && $m != 0 ) { if ( $first ) { close(FP);++$curfilename; push @optnames,$h2[0]; @@ -324,7 +324,7 @@ EOF $c =~ s/'([^ ])'/"<strong>$1<\/strong>"/g; my $k = 0; - if ( $c =~ /^[a-zA-Z_]+:/ ) { + if ( $c =~ /^[[:alpha:]_][[:alnum:]_]+:/ ) { $t = $c; $t =~ s/:.*//; $k = $keys{$t}; @@ -468,8 +468,8 @@ EOF } elsif ( $h1 != 0 ) { if ( $c =~ /^\.(nf|ex)/ ) { my $s = $c; - $s =~ s/^\.[a-z]+\s//; - if ( $s =~ /^[0-9]+$/ ) { + $s =~ s/^\.[[:lower:]]+\s//; + if ( $s =~ /^[[:digit:]]+$/ ) { $count = $s; $once = $s; } @@ -484,7 +484,7 @@ EOF $nf = 0; } elsif ( $input[$n] =~ /^\.ex/ ) { $ex = $once; - $descs{$major[$m]} .= + $descs{$major[$m]} .= "<h3><em>Example" . ($ex > 1 ? "s" : "") |