===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.16
retrieving revision 3.39
diff -u -p -r3.16 -r3.39
--- cvsweb/cvsweb.cgi	2000/09/03 17:33:22	3.16
+++ cvsweb/cvsweb.cgi	2000/11/04 15:32:17	3.39
@@ -9,6 +9,7 @@
 #             Ken Coar         <coar@Apache.Org>
 #             Dick Balaska     <dick@buckosoft.com>
 #             Akinori MUSHA    <knu@FreeBSD.org>
+#             Jens-Uwe Mager   <jum@helios.de>
 #
 # Based on:
 # * Bill Fenners cvsweb.cgi revision 1.28 available from:
@@ -41,8 +42,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $zId: cvsweb.cgi,v 1.94 2000/08/24 06:41:22 hnordstrom Exp $
-# $Id: cvsweb.cgi,v 3.16 2000/09/03 17:33:22 knu Exp $
+# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $
+# $Id: cvsweb.cgi,v 3.39 2000/11/04 15:32:17 knu Exp $
 #
 ###
 
@@ -51,20 +52,22 @@ use strict;
 use vars qw (
     $config $allow_version_select $verbose
     %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
+    @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS
     %alltags @tabcolors %fileinfo %tags @branchnames %nameprinted
     %symrev %revsym @allrevisions %date %author @revdisplayorder
-    @revisions %state %difflines %log %branchpoint @revorder $prcgi
-    @prcategories $prcategories
+    @revisions %state %difflines %log %branchpoint @revorder
+    $prcgi @prcategories $prcategories $mancgi
     $checkoutMagic $doCheckout $scriptname $scriptwhere
     $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars
     %funcline_regexp $is_mod_perl
-    $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
+    $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
     %input $query $barequery $sortby $bydate $byrev $byauthor
-    $bylog $byfile $hr_default $logsort $cvstree $cvsroot
+    $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
     $mimetype $defaultTextPlain $defaultViewable $allow_compress
     $GZIPBIN $backicon $diricon $fileicon $fullname $newname
-    $cvstreedefault $body_tag $logo $defaulttitle $address
-    $backcolor $long_intro $short_instruction $shortLogLen
+    $cvstreedefault $body_tag $body_tag_for_src
+    $logo $defaulttitle $address
+    $long_intro $short_instruction $shortLogLen
     $show_author $dirtable $tablepadding $columnHeaderColorDefault
     $columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite
     $hr_ignkeysubst $diffcolorHeading $diffcolorEmpty $diffcolorRemove
@@ -72,23 +75,29 @@ use vars qw (
     $difffontsize $inputTextSize $mime_types $allow_annotate
     $allow_markup $use_java_script $open_extern_window
     $extern_window_width $extern_window_height $edit_option_form
-    $checkout_magic $show_subdir_lastmod $show_log_in_markup $v
+    $show_subdir_lastmod $show_log_in_markup $v
     $navigationHeaderColor $tableBorderColor $markupLogColor
     $tabstop $state $annTable $sel $curbranch @HideModules
     $module $use_descriptions %descriptions @mytz $dwhere $moddate
-    $use_moddate
+    $use_moddate $has_zlib $gzip_open
+    $LOG_FILESEPARATOR $LOG_REVSEPARATOR
 );
 
 sub printDiffSelect($);
+sub printDiffLinks($$);
+sub printLogSortSelect($);
 sub findLastModifiedSubdirs(@);
+sub htmlify_sub(&$);
 sub htmlify($;$);
-sub spacedHtmlText($);
+sub spacedHtmlText($;$);
 sub link($$);
 sub revcmp($$);
 sub fatal($$);
 sub redirect($);
 sub safeglob($);
 sub getMimeTypeFromSuffix($);
+sub head($;$);
+sub scan_directives(@);
 sub doAnnotate($$);
 sub doCheckout($$);
 sub cvswebMarkup($$$);
@@ -111,6 +120,8 @@ sub download_url($$;$);
 sub download_link($$$;$);
 sub toggleQuery($$);
 sub urlencode($);
+sub htmlquote($);
+sub htmlunquote($);
 sub http_header(;$);
 sub html_header($);
 sub html_footer();
@@ -121,14 +132,13 @@ sub forbidden_module($);
 use Cwd;
 
 # == EDIT this ==
-# User configuration is stored in
-$config = undef;
-
-for ($ENV{CVSWEB_CONFIG},
-#     '/home/knu/etc/cvsweb.conf',
+# Locations to search for user configuration, in order:
+for (
+     $ENV{CVSWEB_CONFIG},
      '/usr/local/etc/cvsweb.conf',
-     getcwd . '/cvsweb.conf') {
-  $config = $_ if defined($_) && -r $_;
+     getcwd() . '/cvsweb.conf'
+    ) {
+    $config = $_ if defined($_) && -r $_;
 }
 
 # == Configuration defaults ==
@@ -142,8 +152,9 @@ $allow_version_select = 1;
 # These are defined to allow checking with perl -cw
 %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =
 %tags = %alltags = @tabcolors = ();
-$cvstreedefault = $body_tag = $logo = $defaulttitle = $address =
-$backcolor = $long_intro = $short_instruction = $shortLogLen =
+$cvstreedefault = $body_tag = $body_tag_for_src =
+$logo = $defaulttitle = $address =
+$long_intro = $short_instruction = $shortLogLen =
 $show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =
 $columnHeaderColorSorted = $hr_breakable = $showfunc = $hr_ignwhite =
 $hr_ignkeysubst = $diffcolorHeading = $diffcolorEmpty = $diffcolorRemove =
@@ -151,15 +162,68 @@ $diffcolorChange = $diffcolorAdd = $diffcolorDarkChang
 $difffontsize = $inputTextSize = $mime_types = $allow_annotate =
 $allow_markup = $use_java_script = $open_extern_window =
 $extern_window_width = $extern_window_height = $edit_option_form =
-$checkout_magic = $show_subdir_lastmod = $show_log_in_markup = $v =
+$show_subdir_lastmod = $show_log_in_markup = $v =
 $navigationHeaderColor = $tableBorderColor = $markupLogColor =
-$tabstop = $use_moddate = $moddate = undef;
+$tabstop = $use_moddate = $moddate = $gzip_open = undef;
 
+$LOG_FILESEPARATOR = q/^={77}$/;
+$LOG_REVSEPARATOR = q/^-{28}$/;
+
+@DIFFTYPES = qw(h H u c s);
+@DIFFTYPES{@DIFFTYPES} = (
+			  {
+			   'descr'   => 'colored',
+			   'opts'    => [ '-u' ],
+			   'colored' => 1,
+			  },
+			  {
+			   'descr'   => 'long colored',
+			   'opts'    => [ '--unified=15' ],
+			   'colored' => 1,
+			  },
+			  {
+			   'descr'   => 'unified',
+			   'opts'    => [ '-u' ],
+			   'colored' => 0,
+			  },
+			  {
+			   'descr'   => 'context',
+			   'opts'    => [ '-c' ],
+			   'colored' => 0,
+			  },
+			  {
+			   'descr'   => 'side by side',
+			   'opts'    => [ '--side-by-side', '--width=164' ],
+			   'colored' => 0,
+			  },
+			 );
+
+@LOGSORTKEYS = qw(cvs date rev);
+@LOGSORTKEYS{@LOGSORTKEYS} = (
+			      {
+			       'descr' => 'Not sorted',
+			      },
+			      {
+			       'descr' => 'Commit date',
+			      },
+			      {
+			       'descr' => 'Revision',
+			      },
+			     );
+
+
 ##### End of configuration variables #####
 
 use Time::Local;
 use IPC::Open2;
 
+# Check if the zlib C library interface is installed, and if yes
+# we can avoid using the extra gzip process.
+eval {
+	require Compress::Zlib;
+};
+$has_zlib = !$@;
+
 $verbose = $v;
 $checkoutMagic = "~checkout~";
 $pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : '';
@@ -181,12 +245,13 @@ $is_mod_perl = defined($ENV{MOD_PERL});
 # per file, so disable the link at the icon
 # in this case:
 $Browser = $ENV{HTTP_USER_AGENT};
+$is_links = ($Browser =~ m`^Links `);
 $is_lynx = ($Browser =~ m`^Lynx/`i);
 $is_w3m = ($Browser =~ m`^w3m/`i);
 $is_msie = ($Browser =~ m`MSIE`);
 $is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`);
 
-$is_textbased = ($is_lynx || $is_w3m);
+$is_textbased = ($is_links || $is_lynx || $is_w3m);
 
 $nofilelinks = $is_textbased;
 
@@ -197,13 +262,13 @@ $nofilelinks = $is_textbased;
 #  braindamaged MS-Internet Exploders claim that they
 # accept gzip .. but don't in fact and
 # display garbage then :-/
-# Turn off gzip if running under mod_perl. piping does
-# not work as expected inside the server. One can probably
-# achieve the same result using Apache::GZIPFilter.
-$maycompress = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`
+# Turn off gzip if running under mod_perl and no zlib is available,
+# piping does not work as expected inside the server.
+$maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})
+		 && $ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`)
 		 || $is_mozilla3)
 		&& !$is_msie
-		&& !$is_mod_perl);
+		&& !($is_mod_perl && !$has_zlib));
 
 # put here the variables we need in order
 # to hold our state - they will be added (with
@@ -212,9 +277,11 @@ $maycompress = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`
 @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
 
 if (-f $config) {
-    do $config;
-}
-else {
+   do $config
+     || &fatal("500 Internal Error",
+	       sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',
+		       $config, &htmlify($@)));
+} else {
    &fatal("500 Internal Error",
 	  'Configuration not found.  Set the variable <code>$config</code> '
           . 'in cvsweb.cgi, or the environment variable '
@@ -266,25 +333,24 @@ foreach (keys %DEFAULTVALUE)
 }
 
 $barequery = "";
+my @barequery;
 foreach (@stickyvars) {
     # construct a query string with the sticky non default parameters set
     if (defined($input{$_}) && $input{$_} ne '' &&
 	!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) {
-        if ($barequery) {
-	    $barequery = $barequery . "&amp;";
-	}
-	my $thisval = urlencode($_) . "=" . urlencode($input{$_});
-	$barequery .= $thisval;
+	push @barequery, join('=', urlencode($_), urlencode($input{$_}));
     }
 }
 # is there any query ?
-if ($barequery) {
+if (@barequery) {
+    $barequery = join('&', @barequery);
     $query = "?$barequery";
-    $barequery = "&amp;" . $barequery;
+    $barequery = "&$barequery";
 }
 else {
     $query = "";
 }
+undef @barequery;
 
 # get actual parameters
 $sortby = $input{"sortby"};
@@ -309,7 +375,7 @@ else {
     $byfile = 1;
 }
 
-$hr_default = $input{'f'} eq 'h';
+$defaultDiffType = $input{'f'};
 
 $logsort = $input{'logsort'};
 
@@ -332,21 +398,33 @@ if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) 
 $cvsroot = $CVSROOT{$cvstree};
 
 # create icons out of description
-foreach my $k (keys %ICONS) {
+my $k;
+foreach $k (keys %ICONS) {
     no strict 'refs';
     my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};
     if ($ipath) {
-	${"${k}icon"} = "<IMG SRC=\"$ipath\" ALT=\"$itxt\" BORDER=\"0\" WIDTH=\"$iwidth\" HEIGHT=\"$iheight\">";
+	${"${k}icon"} = sprintf('<IMG SRC="%s" ALT="%s" BORDER="0" WIDTH="%d" HEIGHT="%d">',
+				htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight)
     }
     else {
 	${"${k}icon"} = $itxt;
     }
 }
+undef $k;
 
+my $config_cvstree = "$config-$cvstree";
+
 # Do some special configuration for cvstrees
-do "$config-$cvstree" if (-f "$config-$cvstree");
+if (-f $config_cvstree) {
+   do $config_cvstree
+     || &fatal("500 Internal Error",
+	       sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',
+		       $config_cvstree, &htmlify($@)));
+}
+undef $config_cvstree;
 
 $prcategories = '(?:' . join('|', @prcategories) . ')';
+$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
 
 $fullname = $cvsroot . '/' . $where;
 $mimetype = &getMimeTypeFromSuffix ($fullname);
@@ -358,7 +436,7 @@ $defaultViewable = $allow_markup && viewable($mimetype
 # ge get an Internal Server Error if we try to pipe the
 # output through the nonexistent gzip ..
 # any more elegant ways to prevent this are welcome!
-if ($allow_compress && $maycompress) {
+if ($allow_compress && $maycompress && !$has_zlib) {
     foreach (split(/:/, $ENV{PATH})) {
 	if (-x "$_/gzip") {
 	    $GZIPBIN = "$_/gzip";
@@ -452,57 +530,63 @@ elsif (-d $fullname) {
 	    }
 	    print "<table  width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n";
 	    $infocols++;
-	    print "<tr><th align=left bgcolor=\"" . (($byfile) ?
-						   $columnHeaderColorSorted :
-						   $columnHeaderColorDefault) . "\">";
-	    print "<a href=\"./" . &toggleQuery("sortby","file") .
-		"#dirlist\">" if (!$byfile);
-	    print "File";
-	    print "</a>" if (!$byfile);
+	    printf '<tr><th align=left bgcolor="%s">',
+	      $byfile ? $columnHeaderColorSorted : $columnHeaderColorDefault;
+	    if ($byfile) {
+		print 'File';
+	    } else {
+		print &link('File', sprintf('./%s#dirlist',
+					    &toggleQuery("sortby", "file")));
+	    }
 	    print "</th>";
 	    # do not display the other column-headers, if we do not have any files
 	    # with revision information:
 	    if (scalar(%fileinfo)) {
 		$infocols++;
-		print "<th align=left bgcolor=\"" . (($byrev) ?
-						   $columnHeaderColorSorted :
-						   $columnHeaderColorDefault) . "\">";
-		print "<a href=\"./" . &toggleQuery ("sortby","rev") .
-		    "#dirlist\">" if (!$byrev);
-		print "Rev.";
-		print "</a>" if (!$byrev);
+		printf '<th align=left bgcolor="%s">',
+		  $byrev ? $columnHeaderColorSorted : $columnHeaderColorDefault;
+		if ($byrev) {
+		    print 'Rev.';
+		} else {
+		    print &link('Rev.', sprintf('./%s#dirlist',
+						&toggleQuery("sortby", "rev")));
+		}
 		print "</th>";
 		$infocols++;
-		print "<th align=left bgcolor=\"" . (($bydate) ?
-						   $columnHeaderColorSorted :
-						   $columnHeaderColorDefault) . "\">";
-		print "<a href=\"./" . &toggleQuery ("sortby","date") .
-		    "#dirlist\">" if (!$bydate);
-		print "Age";
-		print "</a>" if (!$bydate);
+		printf '<th align=left bgcolor="%s">',
+		  $bydate ? $columnHeaderColorSorted : $columnHeaderColorDefault;
+		if ($bydate) {
+		    print 'Age';
+		} else {
+		    print &link('Age', sprintf('./%s#dirlist',
+					       &toggleQuery("sortby", "date")));
+		}
 		print "</th>";
 		if ($show_author) {
 		    $infocols++;
-		    print "<th align=left bgcolor=\"" . (($byauthor) ?
-						   $columnHeaderColorSorted :
-						   $columnHeaderColorDefault) . "\">";
-		    print "<a href=\"./" . &toggleQuery ("sortby","author") .
-			    "#dirlist\">" if (!$byauthor);
-		    print "Author";
-		    print "</a>" if (!$byauthor);
+		    printf '<th align=left bgcolor="%s">',
+		      $byauthor ? $columnHeaderColorSorted : $columnHeaderColorDefault;
+		    if ($byauthor) {
+			print 'Author';
+		    } else {
+			print &link('Author', sprintf('./%s#dirlist',
+						      &toggleQuery("sortby", "author")));
+		    }
 		    print "</th>";
 		}
 		$infocols++;
-		print "<th align=left bgcolor=\"" . (($bylog) ?
-					       $columnHeaderColorSorted :
-					       $columnHeaderColorDefault) . "\">";
-		print "<a href=\"./", toggleQuery("sortby","log"), "#dirlist\">" if (!$bylog);
-		print "Last log entry";
-		print "</a>" if (!$bylog);
+		printf '<th align=left bgcolor="%s">',
+		  $bylog ? $columnHeaderColorSorted : $columnHeaderColorDefault;
+		if ($bylog) {
+		    print 'Last log entry';
+		} else {
+		    print &link('Last log entry', sprintf('./%s#dirlist',
+							  &toggleQuery("sortby", "log")));
+		}
 		print "</th>";
 	    }
 	    elsif ($use_descriptions) {
-		print "<th align=left bgcolor=\"". $columnHeaderColorDefault . "\">";
+		printf '<th align=left bgcolor="%s">', $columnHeaderColorDefault;
 		print "Description";
 		$infocols++;
 	    }
@@ -527,9 +611,9 @@ elsif (-d $fullname) {
 	    closedir($dh);
 	}
 
-	my $hideAtticToggleLink = "<a href=\"./" .
-	        &toggleQuery ("hideattic") .
-		"#dirlist\">[Hide]</a>" if (!$input{'hideattic'});
+	my $hideAtticToggleLink = $input{'hideattic'} ? '' :
+	  &link('[Hide]', sprintf('./%s#dirlist',
+				  &toggleQuery ("hideattic")));
 
 	# Sort without the Attic/ pathname.
 	# place directories first
@@ -567,38 +651,38 @@ elsif (-d $fullname) {
 		next if ($_ eq '..' && $where eq '/');
 		my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}}
 		    if (defined($fileinfo{$_}));
-		print "<tr bgcolor=\"" . @tabcolors[$dirrow%2] . "\"><td>" if ($dirtable);
+		printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable;
 		if ($_ eq '..') {
-		    $url = "../" . $query;
+		    $url = "../$query";
 		    if ($nofilelinks) {
 			print $backicon;
 		    }
 		    else {
-			print &link($backicon,$url);
+			print &link($backicon, $url);
 		    }
-		    print " ", &link("Previous Directory",$url);
+		    print " ", &link("Previous Directory", $url);
 		}
 		else {
-		    $url = urlencode($_) . '/' . $query;
+		    $url = urlencode($_) . "/$query";
 		    print "<A NAME=\"$_\"></A>";
 		    if ($nofilelinks) {
 			print $diricon;
 		    }
 		    else {
-			print &link($diricon,$url);
+			print &link($diricon, $url);
 		    }
-		    print " ", &link($_ . "/", $url), $attic;
+		    print " ", &link("$_/", $url), $attic;
 		    if ($_ eq "Attic") {
-			print "&nbsp; <a href=\"./" .
-			    &toggleQuery ("hideattic") .
-				"#dirlist\">[Don't hide]</a>";
+			print "&nbsp; ";
+			print &link("[Don't hide]", sprintf('./%s#dirlist',
+							    &toggleQuery ("hideattic")));
 		    }
 		}
 		# Show last change in dir
 		if ($filename) {
 		    print "</td><td>&nbsp;</td><td>&nbsp;" if ($dirtable);
 		    if ($date) {
-			print " <i>" . readableTime(time() - $date,0) . "</i>";
+			print " <i>", readableTime(time() - $date,0), "</i>";
 		    }
 		    if ($show_author) {
 			print "</td><td>&nbsp;" if ($dirtable);
@@ -609,8 +693,8 @@ elsif (-d $fullname) {
 		    print "$filename/$rev";
 		    print "<BR>" if ($dirtable);
 		    if ($log) {
-			print "&nbsp;<font size=-1>"
-			    . &htmlify(substr($log,0,$shortLogLen));
+			print "&nbsp;<font size=-1>",
+			  &htmlify(substr($log,0,$shortLogLen));
 			if (length $log > 80) {
 			    print "...";
 			}
@@ -620,7 +704,7 @@ elsif (-d $fullname) {
 		else {
 		    my ($dwhere) = ($where ne "/" ? $where : "") . $_;
 		    if ($use_descriptions && defined $descriptions{$dwhere}) {
-			print "<TD COLSPAN=" . ($infocols-1) . ">&nbsp;" if $dirtable;
+			print "<TD COLSPAN=", ($infocols-1), ">&nbsp;" if $dirtable;
 			print $descriptions{$dwhere};
 		    } elsif ($dirtable && $infocols > 1) {
 			# close the row with the appropriate number of
@@ -651,7 +735,7 @@ elsif (-d $fullname) {
 		next if (!defined($fileinfo{$_}));
 		($rev,$date,$log,$author) = @{$fileinfo{$_}};
 		$filesfound++;
-		print "<tr bgcolor=\"" . @tabcolors[$dirrow%2] . "\"><td>" if ($dirtable);
+		printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable;
 		print "<A NAME=\"$_\"></A>";
 		if ($nofilelinks) {
 		    print $fileicon;
@@ -662,11 +746,11 @@ elsif (-d $fullname) {
 		print " ", &link($_, $url), $attic;
 		print "</td><td>&nbsp;" if ($dirtable);
 		download_link($fileurl,
-			$rev, $rev,
-			$defaultViewable ? "text/x-cvsweb-markup" : undef);
+			      $rev, $rev,
+			      $defaultViewable ? "text/x-cvsweb-markup" : undef);
 		print "</td><td>&nbsp;" if ($dirtable);
 		if ($date) {
-		    print " <i>" . readableTime(time() - $date,0) . "</i>";
+		    print " <i>", readableTime(time() - $date,0), "</i>";
 		}
 		if ($show_author) {
 		    print "</td><td>&nbsp;" if ($dirtable);
@@ -674,7 +758,7 @@ elsif (-d $fullname) {
 		}
 		print "</td><td>&nbsp;" if ($dirtable);
 		if ($log) {
-		    print " <font size=-1>" . &htmlify(substr($log,0,$shortLogLen));
+		    print " <font size=-1>", &htmlify(substr($log,0,$shortLogLen));
 		    if (length $log > 80) {
 			print "...";
 		    }
@@ -689,7 +773,7 @@ elsif (-d $fullname) {
 	if ($dirtable && defined($tableBorderColor)) {
 	    print "</td></tr></table>";
 	}
-	print "". ($dirtable == 1) ? "</table>" : "</menu>" . "\n";
+	print( $dirtable == 1 ? "</table>\n" : "</menu>\n" );
 
 	if ($filesexists && !$filesfound) {
 	    print "<P><B>NOTE:</B> There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n";
@@ -709,7 +793,8 @@ elsif (-d $fullname) {
 	    foreach my $var (@stickyvars) {
 		print "<INPUT TYPE=HIDDEN NAME=\"$var\" VALUE=\"$input{$var}\">\n"
 		    if (defined($input{$var})
-			&& $input{$var} ne $DEFAULTVALUE{$var}
+			&& (!defined($DEFAULTVALUE{$var})
+			    || $input{$var} ne $DEFAULTVALUE{$var})
 			&& $input{$var} ne ""
 			&& $var ne "only_with_tag");
 	    }
@@ -746,12 +831,9 @@ elsif (-d $fullname) {
 	    print "<OPTION",$byrev ? " SELECTED" : ""," VALUE=rev>Revision";
 	    print "<OPTION",$bylog ? " SELECTED" : ""," VALUE=log>Log message";
 	    print "</SELECT></td>";
-	    print "<td>revisions by: \n";
-	    print "<SELECT NAME=logsort>\n";
-	    print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted";
-	    print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date";
-	    print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision";
-	    print "</SELECT></td></tr>";
+	    print "<td>Sort log by: ";
+	    printLogSortSelect(0);
+	    print "</td></tr>";
 	    print "<tr><td>Diff format: ";
 	    printDiffSelect(0);
 	    print "</td>";
@@ -771,15 +853,18 @@ elsif (-d $fullname) {
     elsif (-f $fullname . ',v') {
 	if (defined($input{'rev'}) || $doCheckout) {
 	    &doCheckout($fullname, $input{'rev'});
+	    gzipclose();
 	    exit;
 	}
 	if (defined($input{'annotate'}) && $allow_annotate) {
 	    &doAnnotate($input{'annotate'});
+	    gzipclose();
 	    exit;
 	}
 	if (defined($input{'r1'}) && defined($input{'r2'})) {
 	    &doDiff($fullname, $input{'r1'}, $input{'tr1'},
 		    $input{'r2'}, $input{'tr2'}, $input{'f'});
+	    gzipclose();
 	    exit;
 	}
 	print("going to dolog($fullname)\n") if ($verbose);
@@ -802,6 +887,7 @@ elsif (-d $fullname) {
 	# e.g. foo.c
 	&doDiff($fullname, $input{'r1'}, $input{'tr1'},
 		$input{'r2'}, $input{'tr2'}, $input{'f'});
+	gzipclose();
 	exit;
     }
     elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| &&
@@ -835,22 +921,49 @@ elsif (-d $fullname) {
 	}
 	&fatal("404 Not Found","$where: no such file or directory");
     }
+
+gzipclose();
 ## End MAIN
 
 sub printDiffSelect($) {
     my ($use_java_script) = @_;
-    my ($f) = $input{'f'};
-    print "<SELECT NAME=\"f\"";
-    print " onchange=\"submit()\"" if ($use_java_script);
-    print ">\n";
-    print "<OPTION VALUE=h",$f eq "h" ? " SELECTED" : "", ">Colored Diff";
-    print "<OPTION VALUE=H",$f eq "H" ? " SELECTED" : "", ">Long Colored Diff";
-    print "<OPTION VALUE=u",$f eq "u" ? " SELECTED" : "", ">Unidiff";
-    print "<OPTION VALUE=c",$f eq "c" ? " SELECTED" : "", ">Context Diff";
-    print "<OPTION VALUE=s",$f eq "s" ? " SELECTED" : "", ">Side by Side";
+    my $f = $input{'f'};
+
+    print '<SELECT NAME="f"';
+    print ' onchange="submit()"' if $use_java_script;
+    print '>';
+
+    local $_;
+    for (@DIFFTYPES) {
+	printf('<OPTION VALUE="%s"%s>%s',
+	       $_,
+	       $f eq $_ ? ' SELECTED' : '',
+	       "\u$DIFFTYPES{$_}{'descr'}"
+	      );
+    }
+
     print "</SELECT>";
 }
 
+sub printLogSortSelect($) {
+    my ($use_java_script) = @_;
+
+    print '<SELECT NAME="logsort"';
+    print ' onchange="submit()"' if $use_java_script;
+    print '>';
+
+    local $_;
+    for (@LOGSORTKEYS) {
+	printf('<OPTION VALUE="%s"%s>%s',
+	       $_,
+	       $logsort eq $_ ? ' SELECTED' : '',
+	       "\u$LOGSORTKEYS{$_}{'descr'}"
+	      );
+    }
+
+    print "</SELECT>";
+}
+
 sub findLastModifiedSubdirs(@) {
     my (@dirs) = @_;
     my ($dirname, @files);
@@ -885,58 +998,121 @@ sub findLastModifiedSubdirs(@) {
     return @files;
 }
 
+sub htmlify_sub(&$) {
+    (my $proc, local $_) = @_;
+    local @_ = split(m`(<a [^>]+>[^<]*</a>)`i);
+    my $linked;
+    my $result = '';
+
+    while (($_, $linked) = splice(@_, 0, 2)) {
+	&$proc();
+	$result .= $_ if defined($_);
+	$result .= $linked if defined($linked);
+    }
+
+    $result;
+}
+
 sub htmlify($;$) {
-	my($string, $pr) = @_;
+    (local $_, my $extra) = @_;
 
-	# Special Characters; RFC 1866
-	$string =~ s/&/&amp;/g;
-	$string =~ s/\"/&quot;/g;
-	$string =~ s/</&lt;/g;
-	$string =~ s/>/&gt;/g;
+    $_ = htmlquote($_);
 
-	# get URL's as link ..
-	$string =~ s`(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*`<A HREF="$1$2$3">$1$2$3</A>`g;
-	# get e-mails as link
-	$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`g;
+    # get URL's as link
+    s{
+      (http|ftp|https)://\S+
+     }{
+	 &link($&, htmlunquote($&))
+     }egx;
 
-	# get #PR as link ..
-	if ($pr && defined($prcgi)) {
-	    1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1<A HREF="$prcgi$2">$2</A>`i;
-	    $string =~ s`\b${prcategories}/(\d+)\b`<A HREF="$prcgi$1">$&</A>`igo;
+    # get e-mails as link
+    $_ = htmlify_sub {
+	s<
+	  [\w+=\-.!]+@[\w\-]+(\.[\w\-]+)+
+	    ><
+	      &link($&, "mailto:$&")
+		>egix;
+    } $_;
+
+    if ($extra) {
+	# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn"
+	if (defined($prcgi)) {
+	    my $prev;
+
+	    do {
+		$prev = $_;
+
+		$_ = htmlify_sub {
+		    s{
+		      (\bPR[:\#]?\s*
+		       (?:
+			\#?
+			\d+[,\s]\s*
+		       )*
+		       \#?)
+		      (\d+)\b
+		     }{
+			 $1 . &link($2, sprintf($prcgi, $2)) . $3
+		     }egix;
+		} $_;
+	    } while ($_ ne $prev);
+
+	    $_ = htmlify_sub {
+		s{
+		  (\b$prcategories/(\d+)\b)
+		 }{
+		     &link($1, sprintf($prcgi, $2)) . $3
+		 }egox;
+	    } $_;
 	}
 
-	return $string;
+	# get manpage specs as link: "foo.1" "foo(1)"
+	if (defined($mancgi)) {
+	    $_ = htmlify_sub {
+		s{
+		  (\b([a-zA-Z][\w_.]+)
+		   (?:
+		    \( ([0-9n]) \)\B
+		    |
+		    \.([0-9n])\b
+		   )
+		  )
+		 }{
+		     &link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2)) . $5
+		 }egx;
+	    } $_;
+	}
+    }
+
+    $_;
 }
 
-sub spacedHtmlText($) {
+sub spacedHtmlText($;$) {
 	local $_ = $_[0];
+	my $ts = $_[1] || $tabstop;
 
-	# Cut trailing spaces
-	s/\s+\n$//;
+	# Cut trailing spaces and tabs
+	s/[ \t]+$//;
 
-	# Expand tabs
-	s/\t+/' ' x (length($&) * $tabstop - length($`) % $tabstop)/e
-	    if (defined($tabstop));
+        if (defined($ts)) {
+	    # Expand tabs
+	    1 while s/\t+/' ' x (length($&) * $ts - length($`) % $ts)/e
+	}
 
 	# replace <tab> and <space> (\001 is to protect us from htmlify)
 	# gzip can make excellent use of this repeating pattern :-)
-	s/\001/\001%/g; #protect our & substitute
 	if ($hr_breakable) {
 	    # make every other space 'breakable'
-	    s/	/ \001nbsp; \001nbsp; \001nbsp; \001nbsp;/g;    # <tab>
 	    s/  / \001nbsp;/g;                              # 2 * <space>
 	    # leave single space as it is
-	}
-	else {
-	    s/	/\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;/g;
+	} else {
 	    s/ /\001nbsp;/g;
 	}
 
 	$_ = htmlify($_);
 
 	# unescape
-	s/\001([^%])/&$1/g;
-	s/\001%/\001/g;
+	y/\001/&/;
 
 	return $_;
 }
@@ -944,7 +1120,7 @@ sub spacedHtmlText($) {
 sub link($$) {
 	my($name, $where) = @_;
 
-	return "<A HREF=\"$where\">$name</A>\n";
+	sprintf '<A HREF="%s">%s</A>', htmlquote($where), $name;
 }
 
 sub revcmp($$) {
@@ -992,7 +1168,7 @@ sub redirect($) {
 		print "Location: $url\r\n";
 	}
 	html_header("Moved");
-	print "This document is located <A HREF=$url>here</A>.\n";
+	print "This document is located ", &link('here', $url), "\n";
 	print &html_footer;
 	exit(1);
 }
@@ -1018,7 +1194,7 @@ sub safeglob($) {
 		$glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg;
 		foreach (readdir($dh)) {
 			if (/^${glob}$/) {
-				push(@results, $dirname . "/" .$_);
+				push(@results, "$dirname/" .$_);
 			}
 		}
 	}
@@ -1056,6 +1232,40 @@ sub getMimeTypeFromSuffix($) {
 }
 
 ###############################
+# read first lines like head(1)
+###############################
+sub head($;$) {
+    my $fh = $_[0];
+    my $linecount = $_[1] || 10;
+
+    my @buf;
+
+    if ($linecount > 0) {
+	my $i;
+	for ($i = 0; !eof($fh) && $i < $linecount; $i++) {
+	    push @buf, scalar <$fh>;
+	}
+    } else {
+	@buf = <$fh>;
+    }
+
+    @buf;
+}
+
+###############################
+# scan vim and Emacs directives
+###############################
+sub scan_directives(@) {
+    my $ts = undef;
+
+    for (@_) {
+	$ts = $1 if /\b(?:ts|tabstop|tab-width)[:=]\s*([1-9]\d*)\b/;
+    }
+
+    ('tabstop' => $ts);
+}
+
+###############################
 # show Annotation
 ###############################
 sub doAnnotate($$) {
@@ -1075,11 +1285,6 @@ sub doAnnotate($$) {
     ($pathname = $where) =~ s/(Attic\/)?[^\/]*$//;
     ($filename = $where) =~ s/^.*\///;
 
-    http_header();
-
-    navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");
-    print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n";
-
     # this seems to be necessary
     $| = 1; $| = 0; # Flush
 
@@ -1089,7 +1294,7 @@ sub doAnnotate($$) {
     # the public domain.
     # we could abandon the use of rlog, rcsdiff and co using
     # the cvsserver in a similiar way one day (..after rewrite)
-    $pid = open2($reader, $writer, "cvs server") || fatal ("500 Internal Error",
+    $pid = open2($reader, $writer, "cvs -Rl server") || fatal ("500 Internal Error",
 							       "Fatal Error - unable to open cvs for annotation");
 
     # OK, first send the request to the server.  A simplified example is:
@@ -1141,6 +1346,11 @@ sub doAnnotate($$) {
     # were nicer about buffering, then we could just leave it open, I think.
     close ($writer) || die "cannot close: $!";
 
+    http_header();
+
+    navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");
+    print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n";
+
     # Ready to get the responses from the server.
     # For example:
     #     E Annotations for foo/xx
@@ -1156,7 +1366,15 @@ sub doAnnotate($$) {
     else {
 	print "<pre>";
     }
-    while (<$reader>) {
+
+    # prefetch several lines
+    my @buf = head($reader);
+
+    my %d = scan_directives(@buf);
+
+    while (@buf || !eof($reader)) {
+	$_ = @buf ? shift @buf : <$reader>;
+
 	my @words = split;
 	# Adding one is for the (single) space which follows $words[0].
 	my $rest = substr ($_, length ($words[0]) + 1);
@@ -1165,39 +1383,48 @@ sub doAnnotate($$) {
 	}
 	elsif ($words[0] eq "M") {
 	    $lineNr++;
-	    my $lrev = substr ($_, 2, 13);
-	    my $lusr = substr ($_, 16,  9);
-	    my $line = substr ($_, 36);
+	    (my $lrev = substr($_, 2, 13)) =~ y/ //d;
+	    (my $lusr = substr($_, 16,  9)) =~ y/ //d;
+	    my $line = substr($_, 36);
+	    my $isCurrentRev = ($rev eq $lrev);
 	    # we should parse the date here ..
 	    if ($lrev eq $oldLrev) {
-		$revprint = "             ";
+		$revprint = sprintf('%-8s', '');
 	    }
 	    else {
-		$revprint = $lrev; $oldLusr = "";
+		$revprint = sprintf('%-8s', $lrev);
+		$revprint =~ s`\S+`&link($&, "$scriptwhere$query#rev$&")`e;	# `
+		$oldLusr = '';
 	    }
 	    if ($lusr eq $oldLusr) {
-		$usrprint = "         ";
+		$usrprint = '';
 	    }
 	    else {
 		$usrprint = $lusr;
 	    }
 	    $oldLrev = $lrev;
 	    $oldLusr = $lusr;
-	    # is there a less timeconsuming way to strip spaces ?
-	    ($lrev = $lrev) =~ s/\s+//g;
-	    my $isCurrentRev = ($rev eq $lrev);
 
-	    print "<b>" if ($isCurrentRev);
-	    printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);
-	    print spacedHtmlText($line);
-	    print "</b>" if ($isCurrentRev);
+	    # Set bold for text-based browsers only - graphical
+	    # browsers show bold fonts a bit wider than regular fonts,
+	    # so it looks irregular.
+	    print "<b>" if ($isCurrentRev && $is_textbased);
+
+	    printf "%s%s %-8s %4d:",
+		    $revprint,
+		    $isCurrentRev ? '!' : ' ',
+		    $usrprint,
+		    $lineNr;
+	    print spacedHtmlText($line, $d{'tabstop'});
+
+	    print "</b>" if ($isCurrentRev && $is_textbased);
 	}
 	elsif ($words[0] eq "ok") {
 	    # We could complain about any text received after this, like the
 	    # CVS command line client.  But for simplicity, we don't.
 	}
 	elsif ($words[0] eq "error") {
-	    fatal ("500 Internal Error", "Error occured during annotate: <b>$_</b>");
+	    fatal("500 Internal Error", "Error occured during annotate: <b>$_</b>");
 	}
     }
     if ($annTable) {
@@ -1314,12 +1541,14 @@ sub cvswebMarkup($$$) {
     print "<HR noshade>";
     print "<table width=\"100%\"><tr><td bgcolor=\"$markupLogColor\">";
     print "File: ", &clickablePath($where, 1);
-    print "&nbsp;";
-    &download_link(urlencode($fileurl), $revision, "(download)");
+    print "&nbsp;(";
+    &download_link($fileurl, $revision, "download");
+    print ")";
     if (!$defaultTextPlain) {
-	print "&nbsp;";
-	&download_link(urlencode($fileurl), $revision, "(as text)",
+	print "&nbsp;(";
+	&download_link($fileurl, $revision, "as text",
 	       "text/plain");
+	print ")";
     }
     print "<BR>\n";
     if ($show_log_in_markup) {
@@ -1332,16 +1561,26 @@ sub cvswebMarkup($$$) {
 	    $input{only_with_tag};
     }
     print "</td></tr></table>";
-    my @content = <$filehandle>;
     my $url = download_url($fileurl, $revision, $mimetype);
     print "<HR noshade>";
     if ($mimetype =~ /^image/) {
-	print "<IMG SRC=\"$url$barequery\"><BR>";
+	printf '<IMG SRC="%s"><BR>', htmlquote("$url$barequery");
     }
+    elsif ($mimetype =~ m%^application/pdf%) {
+	printf '<EMBED SRC="%s" WIDTH="100%"><BR>', htmlquote("$url$barequery");
+    }
     else {
 	print "<PRE>";
-	foreach (@content) {
-	    print spacedHtmlText($_);
+
+	# prefetch several lines
+	my @buf = head($filehandle);
+
+	my %d = scan_directives(@buf);
+
+	while (@buf || !eof($filehandle)) {
+	    $_ = @buf ? shift @buf : <$filehandle>;
+
+	    print spacedHtmlText($_, $d{'tabstop'});
 	}
 	print "</PRE>";
     }
@@ -1350,7 +1589,7 @@ sub cvswebMarkup($$$) {
 sub viewable($) {
     my ($mimetype) = @_;
 
-    $mimetype =~ m%^(text|image)/%;
+    $mimetype =~ m%^((text|image)/|application/pdf)% ;
 }
 
 ###############################
@@ -1359,7 +1598,7 @@ sub viewable($) {
 sub doDiff($$$$$$) {
 	my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;
         my $fh = do {local(*FH);};
-	my ($rev1, $rev2, $sym1, $sym2, @difftype, $diffname, $f1, $f2);
+	my ($rev1, $rev2, $sym1, $sym2, $f1, $f2);
 
 	if ($r1 =~ /([^:]+)(:(.+))?/) {
 	    $rev1 = $1;
@@ -1393,36 +1632,18 @@ sub doDiff($$$$$$) {
 	    ($rev1, $sym1) = ($rev2, $sym2);
 	    ($rev2, $sym2) = ($tmp1, $tmp2);
 	}
-	my $human_readable = 0;
-	if ($f eq 'c') {
-	    @difftype = qw{-c};
-	    $diffname = "Context diff";
-	}
-	elsif ($f eq 's') {
-	    @difftype = qw{--side-by-side --width=164};
-	    $diffname = "Side by Side";
-	}
-	elsif ($f eq 'H') {
-	    $human_readable = 1;
-	    @difftype = qw{--unified=15};
-	    $diffname = "Long Human readable";
-	}
-	elsif ($f eq 'h') {
-	    @difftype =qw{-u};
-	    $human_readable = 1;
-	    $diffname = "Human readable";
-	}
-	elsif ($f eq 'u') {
-	    @difftype = qw{-u};
-	    $diffname = "Unidiff";
-	}
-	else {
+	my $difftype = $DIFFTYPES{$f};
+
+	if (!$difftype) {
 	    fatal ("400 Bad arguments", "Diff format $f not understood");
 	}
 
+	my @difftype       = @{$difftype->{'opts'}};
+	my $human_readable = $difftype->{'colored'};
+
 	# apply special options
 	if ($showfunc) {
-	    push @difftype, '-p' if $f =~ /^[cHhu]$/;
+	    push @difftype, '-p' if $f ne 's';
 
 	    my($re1, $re2);
 
@@ -1448,6 +1669,7 @@ sub doDiff($$$$$$) {
 	if ($human_readable) {
 	    http_header();
 	    &human_readable_diff($fh, $rev2);
+	    gzipclose();
 	    exit;
 	}
 	else {
@@ -1483,14 +1705,14 @@ sub doDiff($$$$$$) {
 		s|$cvsroot/||o;
 		if ($sym1) {
 		    chop;
-		    $_ .= " " . $sym1 . "\n";
+		    $_ .= " $sym1\n";
 		}
 	    }
 	    elsif (m|^$f2 $cvsroot|o) {
 		s|$cvsroot/||o;
 		if ($sym2) {
 		    chop;
-		    $_ .= " " . $sym2 . "\n";
+		    $_ .= " $sym2\n";
 		}
 	    }
 	    print $_;
@@ -1583,7 +1805,7 @@ again:
 	if ($state eq "tags" && /^\S/) {
 	    if (defined($tag) && (defined($symrev{$tag}) || $tag eq "HEAD")) {
 		$revwanted = $tag eq "HEAD" ? $symrev{"MAIN"} : $symrev{$tag};
-		($branch = $revwanted) =~ s/\b0\.//;
+		($branch = $revwanted) =~ s/\.0\././;
 		($branchpoint = $branch) =~ s/\.?\d+$//;
 		$revwanted = undef if ($revwanted ne $branch);
 	    }
@@ -1598,7 +1820,7 @@ again:
 	    $state = "head";
 	    goto again;
 	}
-	if ($state eq "head" && /^----------------------------$/) {
+	if ($state eq "head" && /$LOG_REVSEPARATOR/o) {
 	    $state = "log";
 	    $rev = undef;
 	    $date = undef;
@@ -1608,14 +1830,13 @@ again:
 	    next;
 	}
 	if ($state eq "log") {
-	    if (/^----------------------------$/
-		|| /^=============================/) {
+	    if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) {
 		# End of a log entry.
 		my $revbranch;
 		($revbranch = $rev) =~ s/\.\d+$//;
-		print "$filename $rev Wanted: $revwanted "
-		    . "Revbranch: $revbranch Branch: $branch "
-		    . "Branchpoint: $branchpoint\n" if ($verbose);
+		print "$filename $rev Wanted: $revwanted ",
+		  "Revbranch: $revbranch Branch: $branch ",
+		    "Branchpoint: $branchpoint\n" if ($verbose);
 		if (!defined($revwanted) && defined($branch)
 		    && $branch eq $revbranch || !defined($tag)) {
 		    print "File revision $rev found for branch $branch\n"
@@ -1653,10 +1874,10 @@ again:
 		next;
 	    }
 	    else {
-		$log = $log . $_;
+		$log .= $_;
 	    }
 	}
-	if (/^===============/) {
+	if (/$LOG_FILESEPARATOR/o) {
 	    $state = "start";
 	    next;
 	}
@@ -1730,7 +1951,7 @@ sub readLog($;$) {
 # log info
 # ----------------------------
 	logentry:
-	while (!/^=========/) {
+	while (!/$LOG_FILESEPARATOR/o) {
 	    $_ = <$fh>;
 	    last logentry if (!defined($_));	# EOF
 	    print "R:", $_ if ($verbose);
@@ -1738,7 +1959,7 @@ sub readLog($;$) {
 		$rev = $1;
 		unshift(@allrevisions,$rev);
 	    }
-	    elsif (/^========/ || /^----------------------------$/) {
+	    elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) {
 		next logentry;
 	    }
 	    else {
@@ -1772,7 +1993,7 @@ sub readLog($;$) {
 	    while (<$fh>) {
 		print "L:", $_ if ($verbose);
 		next line if (/^branches:\s/);
-		last line if (/^----------------------------$/ || /^=========/);
+		last line if (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o);
 		$log{$rev} .= $_;
 	    }
 	    print "E:", $_ if ($verbose);
@@ -1813,7 +2034,7 @@ sub readLog($;$) {
 
 	foreach (reverse sort keys %symrev) {
 	    $rev = $symrev{$_};
-	    if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {
+	    if ($rev =~ /^((.*)\.)0\.(\d+)$/) {
 		push(@branchnames, $_);
 		#
 		# A revision number of A.B.0.D really translates into
@@ -1826,9 +2047,11 @@ sub readLog($;$) {
 		# with the branch number 0.A, with the exception that
 		# it has no head to translate to if there is nothing on
 		# the branch, but I guess this can never happen?
-		# (the code below gracefully forgets about the branch
-		# if it should happen)
 		#
+		# Since some stupid people actually import/check in
+		# files with version 0.X we assume that the above cannot
+		# happen, and regard 0.X(.*) as a revision and not a branch.
+		#
 		$head = defined($2) ? $2 : "";
 		$branch = $3;
 		$branchrev = $head . ($head ne "" ? "." : "") . $branch;
@@ -1858,7 +2081,7 @@ sub readLog($;$) {
 	my ($onlyonbranch, $onlybranchpoint);
 	if ($onlyonbranch = $input{'only_with_tag'}) {
 	    $onlyonbranch = $symrev{$onlyonbranch};
-	    if ($onlyonbranch =~ s/\b0\.//) {
+	    if ($onlyonbranch =~ s/\.0\././) {
 		($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;
 	    }
             else {
@@ -1896,6 +2119,20 @@ sub readLog($;$) {
 
 }
 
+sub printDiffLinks($$) {
+    my($text, $url) = @_;
+    my @extra;
+
+    local $_;
+    for ($DIFFTYPES{$defaultDiffType}{'colored'} ? qw(u) : qw(h)) {
+	my $f = $_ eq $defaultDiffType ? '' : $_;
+
+	push @extra, &link(lc $DIFFTYPES{$_}{'descr'}, "$url&f=$f");
+    }
+
+    print &link($text, $url), ' (', join(', ', @extra), ')';
+}
+
 sub printLog($;$) {
 	my ($link, $br, $brp);
 	($_,$link) = @_;
@@ -1924,29 +2161,40 @@ sub printLog($;$) {
 	    }
 	    print "\n Revision ";
 	    &download_link($fileurl, $_, $_,
-		$defaultViewable ? "text/x-cvsweb-markup" : undef);
+			   $defaultViewable ? "text/x-cvsweb-markup" : undef);
 	    if ($defaultViewable) {
-		print " / ";
-		&download_link($fileurl, $_, "(download)", $mimetype);
+		print " / (";
+		&download_link($fileurl, $_, "download", $mimetype);
+		print ")";
 	    }
 	    if (not $defaultTextPlain) {
-		print " / ";
-		&download_link($fileurl, $_, "(as text)",
-			   "text/plain");
+		print " / (";
+		&download_link($fileurl, $_, "as text", "text/plain");
+		print ")";
 	    }
 	    if (!$defaultViewable) {
-		print " / ";
-		&download_link($fileurl, $_, "(view)", "text/x-cvsweb-markup");
+		print " / (";
+		&download_link($fileurl, $_, "view", "text/x-cvsweb-markup");
+		print ")";
 	    }
 	    if ($allow_annotate) {
-		print " - <a href=\"" . $scriptname . "/" . urlencode($where) . "?annotate=$_$barequery\">";
-		print "annotate</a>";
+		print " - ";
+		print &link('annotate',
+			    sprintf('%s/%s?annotate=%s%s',
+				    $scriptname,
+				    urlencode($where),
+				    $_,
+				    $barequery));
 	    }
 	    # Plus a select link if enabled, and this version isn't selected
 	    if ($allow_version_select) {
 		if ((!defined($input{"r1"}) || $input{"r1"} ne $_)) {
-		    print " - <A HREF=\"${scriptwhere}?r1=$_$barequery" .
-			"\">[select for diffs]</A>\n";
+		    print " - ";
+		    print &link('[select for diffs]',
+				sprintf('%s?r1=%s%s',
+					$scriptwhere,
+					$_,
+					$barequery));
 		}
 		else {
 		    print " - <b>[selected]</b>";
@@ -1961,13 +2209,13 @@ sub printLog($;$) {
 	}
 	if (defined @mytz) {
 	    my ($est) = $mytz[(localtime($date{$_}))[8]];
-	    print ", <i>" . scalar localtime($date{$_}) . " $est</i> (";
+	    print ", <i>", scalar localtime($date{$_}), " $est</i> (";
 	} else {
-	    print ", <i>" . scalar gmtime($date{$_}) . " UTC</i> (";
+	    print ", <i>", scalar gmtime($date{$_}), " UTC</i> (";
 	}
-	print readableTime(time() - $date{$_},1) . " ago)";
+	print readableTime(time() - $date{$_},1), " ago)";
 	print " by ";
-	print "<i>" . $author{$_} . "</i>\n";
+	print "<i>", $author{$_}, "</i>\n";
 	print "<BR>Branch: <b>",$link?link_tags($revsym{$br}):$revsym{$br},"</b>\n"
 	    if ($revsym{$br});
 	print "<BR>CVS Tags: <b>",$link?link_tags($revsym{$_}):$revsym{$_},"</b>"
@@ -2001,23 +2249,28 @@ sub printLog($;$) {
 	    # Offer diff to previous revision
 	    if ($prev) {
 		$diffrev{$prev} = 1;
-		print " to previous <A HREF=\"${scriptwhere}.diff?r1=$prev";
-		print "&amp;r2=$_" . $barequery . "\">$prev</A>\n";
-		if (!$hr_default) { # offer a human readable version if not default
-		    print "(<A HREF=\"${scriptwhere}.diff?r1=$prev";
-		    print "&amp;r2=$_" . $barequery . "&amp;f=h\">colored</A>)\n";
-		}
+
+		my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
+				  $scriptwhere,
+				  $prev,
+				  $_,
+				  $barequery);
+
+		print " to previous ";
+		printDiffLinks($prev, $url);
 	    }
 	    #
 	    # Plus, if it's on a branch, and it's not a vendor branch,
 	    # offer a diff with the branch point.
 	    if ($revsym{$brp} && !/^1\.1\.1\.\d+$/ && !defined($diffrev{$brp})) {
-		print " to branchpoint <A HREF=\"${scriptwhere}.diff?r1=$brp";
-		print "&amp;r2=$_" . $barequery . "\">$brp</A>\n";
-		if (!$hr_default) { # offer a human readable version if not default
-		print "(<A HREF=\"${scriptwhere}.diff?r1=$brp";
-		print "&amp;r2=$_" . $barequery . "&amp;f=h\">colored</A>)\n";
-		}
+		my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
+				  $scriptwhere,
+				  $brp,
+				  $_,
+				  $barequery);
+
+		print " to branchpoint ";
+		printDiffLinks($brp, $url);
 	    }
 	    #
 	    # Plus, if it's on a branch, and it's not a vendor branch,
@@ -2042,29 +2295,30 @@ sub printLog($;$) {
 		}
 		if (!defined($diffrev{$nextmain})) {
 		    $diffrev{$nextmain} = 1;
-		    print " next main <A HREF=\"${scriptwhere}.diff?r1=$nextmain";
-		    print "&amp;r2=$_" . $barequery .
-			"\">$nextmain</A>\n";
-		    if (!$hr_default) { # offer a human readable version if not default
-			print "(<A HREF=\"${scriptwhere}.diff?r1=$nextmain";
-			print "&amp;r2=$_" . $barequery .
-			    "&amp;f=h\">colored</A>)\n";
-		    }
+
+		    my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
+				      $scriptwhere,
+				      $nextmain,
+				      $_,
+				      $barequery);
+
+		    print " next main ";
+		    printDiffLinks($nextmain, $url);
 		}
 	    }
 	    # Plus if user has selected only r1, then present a link
 	    # to make a diff to that revision
 	    if (defined($input{"r1"}) && !defined($diffrev{$input{"r1"}})) {
 		$diffrev{$input{"r1"}} = 1;
-		print " to selected <A HREF=\"${scriptwhere}.diff?"
-			. "r1=$input{'r1'}&amp;r2=$_" . $barequery
-			. "\">$input{'r1'}</A>\n";
-		if (!$hr_default) { # offer a human readable version if not default
-		    print "(<A HREF=\"${scriptwhere}.diff?r1=$input{'r1'}";
-		    print "&amp;r2=$_" . $barequery .
-			"&amp;f=h\">colored</A>)\n";
 
-		}
+		my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
+				  $scriptwhere,
+				  $input{'r1'},
+				  $_,
+				  $barequery);
+
+		print " to selected ";
+		printDiffLinks($input{'r1'}, $url);
 	    }
 	}
 	print "<PRE>\n";
@@ -2083,11 +2337,10 @@ sub doLog($) {
         ($filename = $where) =~ s|^.*/||;
         $backurl = $scriptname . "/" . urlencode($upwhere) . $query;
 	print &link($backicon, "$backurl#$filename"),
-              " <b>Up to ", &clickablePath($upwhere, 1), "</b><p>\n";
-	print <<EOF;
-<A HREF="#diff">Request diff between arbitrary revisions</A>
-<HR NOSHADE>
-EOF
+	  " <b>Up to ", &clickablePath($upwhere, 1), "</b><p>\n";
+	print &link('Request diff between arbitrary revisions', '#diff');
+        print '<HR NOSHADE>';
+
 	if ($curbranch) {
 	    print "Default branch: ", ($revsym{$curbranch} || $curbranch);
 	}
@@ -2115,42 +2368,44 @@ EOF
 	print "</A><P>\n";
 	print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}.diff\" NAME=\"diff_select\">\n";
         foreach (@stickyvars) {
-	    print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"
+	    printf('<INPUT TYPE=HIDDEN NAME="%s" VALUE="%s">',  $_, $input{$_})
 		if (defined($input{$_})
-		    && ($input{$_} ne $DEFAULTVALUE{$_} && $input{$_} ne ""));
+		    && ((!defined($DEFAULTVALUE{$_})
+		         || $input{$_} ne $DEFAULTVALUE{$_})
+		        && $input{$_} ne ""));
 	}
-	print "Diffs between \n";
+	print "<TABLE><TR>\n";
+	print "<TD align=right>Diffs between \n";
 	print "<SELECT NAME=\"r1\">\n";
 	print "<OPTION VALUE=\"text\" SELECTED>Use Text Field\n";
 	print $sel;
 	print "</SELECT>\n";
 	$diffrev = $revdisplayorder[$#revdisplayorder];
 	$diffrev = $input{"r1"} if (defined($input{"r1"}));
-	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'>\n";
-	print " and \n";
+	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'></TD>";
+	print "<TD><BR></TD></TR>\n";
+	print "<TR><TD align=right>and \n";
 	print "<SELECT NAME=\"r2\">\n";
 	print "<OPTION VALUE=\"text\" SELECTED>Use Text Field\n";
 	print $sel;
 	print "</SELECT>\n";
 	$diffrev = $revdisplayorder[0];
 	$diffrev = $input{"r2"} if (defined($input{"r2"}));
-	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='document.diff_select.r2.selectedIndex=0'>\n";
-        print "<BR>Type of Diff should be a&nbsp;";
-	printDiffSelect(0);
-	print "<INPUT TYPE=SUBMIT VALUE=\"  Get Diffs  \">\n";
+	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='document.diff_select.r2.selectedIndex=0'></TD>";
+	print "<TD><INPUT TYPE=SUBMIT VALUE=\"  Get Diffs  \"></TD>\n";
 	print "</FORM>\n";
+	print "</TR></TABLE>\n";
 	print "<HR noshade>\n";
+	print "<TABLE>";
+	print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
+	print "<TR><TD align=right>Preferred Diff type:</TD>";
+	print "<TD>";
+	printDiffSelect($use_java_script);
+	print "</TD><TD></TD></TR>\n";
         if (@branchnames) {
+	    print "<TR><TD align=right>View only Branch:</TD>";
+	    print "<TD>";
 	    print "<A name=branch></A>\n";
-	    print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
-	    foreach (@stickyvars) {
-		next if ($_ eq "only_with_tag");
-		next if ($_ eq "logsort");
-		print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"
-		    if (defined($input{$_}) && $input{$_} ne $DEFAULTVALUE{$_}
-			&& $input{$_} ne "");
-	    }
-	    print "View only Branch: \n";
 	    print "<SELECT NAME=\"only_with_tag\"";
 	    print " onchange=\"submit()\"" if ($use_java_script);
 	    print ">\n";
@@ -2164,29 +2419,27 @@ EOF
 			&& $input{"only_with_tag"} eq $_);
 		print ">${_}\n";
 	    }
-	    print "</SELECT>\n";
-	    print "<INPUT TYPE=SUBMIT VALUE=\"  View Branch  \">\n";
-	    print "</FORM>\n";
+	    print "</SELECT></TD><TD></TD></TR>\n";
 	}
-	print "<A name=logsort></A>\n";
-	print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
 	foreach (@stickyvars) {
+	    next if ($_ eq "f");
 	    next if ($_ eq "only_with_tag");
 	    next if ($_ eq "logsort");
 	    print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"
-		if (defined($input{$_}) && $input{$_} ne $DEFAULTVALUE{$_}
+		if (defined($input{$_})
+		    && (!defined($DEFAULTVALUE{$_})
+		        || $input{$_} ne $DEFAULTVALUE{$_})
 		    && $input{$_} ne "");
 	}
-	print "Sort log by: \n";
-	print "<SELECT NAME=\"logsort\"";
-	print " onchange=\"submit()\"" if ($use_java_script);
-	print ">\n";
-	print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted";
-	print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date";
-	print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision";
-	print "</SELECT>\n";
-	print "<INPUT TYPE=SUBMIT VALUE=\"  Sort  \">\n";
+	print "<TR><TD align=right>";
+	print "<A name=logsort></A>\n";
+	print "Sort log by:</TD>";
+	print "<TD>";
+	printLogSortSelect($use_java_script);
+	print "</TD>";
+	print "<TD><INPUT TYPE=SUBMIT VALUE=\"  Set  \"></TD>";
 	print "</FORM>\n";
+	print "</TR></TABLE>";
         print &html_footer;
 	print "</BODY></HTML>\n";
 }
@@ -2226,7 +2479,7 @@ sub flush_diff_rows($$$$) {
 # human_readable_diff(String revision_to_return_to);
 ##
 sub human_readable_diff($){
-  my ($i,$difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd);
+  my ($difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd);
   my ($fh, $rev) = @_;
   my ($date1, $date2, $r1d, $r2d, $r1r, $r2r, $rev1, $rev2, $sym1, $sym2);
   my (@rightCol, @leftCol);
@@ -2253,17 +2506,16 @@ sub human_readable_diff($){
     $date2 = $r2d;
   }
 
-  print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n";
-
-  print "<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n";
-  print "<tr bgcolor=\"#ffffff\">\n";
-  print "<th width=\"50%\" valign=TOP>";
-  print "version $rev1";
+  print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n",
+    "<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n",
+      "<tr bgcolor=\"#ffffff\">\n",
+	"<th width=\"50%\" valign=TOP>",
+	  "version $rev1";
   print ", $date1" if (defined($date1));
   print "<br>Tag: $sym1\n" if ($sym1);
-  print "</th>\n";
-  print "<th width=\"50%\" valign=TOP>";
-  print "version $rev2";
+  print "</th>\n",
+    "<th width=\"50%\" valign=TOP>",
+      "version $rev2";
   print ", $date2" if (defined($date2));
   print "<br>Tag: $sym2\n" if ($sym1);
   print "</th>\n";
@@ -2280,9 +2532,15 @@ sub human_readable_diff($){
   # cascading style sheets because we've to set the
   # font and color for each row. anyone ...?
   ####
-  while (<$fh>) {
-      $difftxt = $_;
 
+  # prefetch several lines
+  my @buf = head($fh);
+
+  my %d = scan_directives(@buf);
+
+  while (@buf || !eof($fh)) {
+      $difftxt = @buf ? shift @buf : <$fh>;
+
       if ($difftxt =~ /^@@/) {
 	  ($oldline,$newline,$funname) = $difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/;
           print  "<tr bgcolor=\"$diffcolorHeading\"><td width=\"50%\">";
@@ -2298,7 +2556,7 @@ sub human_readable_diff($){
       }
       else {
 	  ($diffcode,$rest) = $difftxt =~ /^([-+ ])(.*)/;
-	  $_ = spacedHtmlText ($rest);
+	  $_ = spacedHtmlText($rest, $d{'tabstop'});
 
 	  # Add fontface, size
 	  $_ = "$fs&nbsp;$_$fe";
@@ -2382,12 +2640,12 @@ sub navigateHeader($$$$$) {
     $swhere = urlencode($filename) if ($swhere eq "");
     print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
     print "<HTML>\n<HEAD>\n";
-    print '<!-- CVSweb $zRevision: 1.94 $  $Revision: 3.16 $ -->';
+    print '<!-- CVSweb $zRevision: 1.104 $  $Revision: 3.39 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
-    print  "<BODY BGCOLOR=\"$backcolor\">\n";
+    print  "$body_tag_for_src\n";
     print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
     print "<tr valign=bottom><td>";
-    print  "<a href=\"$swhere$query#rev$rev\">$backicon";
+    print &link($backicon, "$swhere$query#rev$rev");
     print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log";
     print "</b> $fileicon</td>";
 
@@ -2398,10 +2656,10 @@ sub navigateHeader($$$$$) {
 sub plural_write($$) {
     my ($num,$text) = @_;
     if ($num != 1) {
-	$text = $text . "s";
+	$text .= "s";
     }
     if ($num > 0) {
-	return $num . " " . $text;
+	return join(' ', $num, $text);
     }
     else {
 	return "";
@@ -2445,7 +2703,7 @@ sub readableTime($$) {
 	my $resttime = plural_write(int ($rest / $break),
 				$desc{$break});
 	if ($resttime) {
-	    $retval = $retval . ", " . $resttime;
+	    $retval .= ", $resttime";
 	}
     }
 
@@ -2469,24 +2727,26 @@ sub clickablePath($$) {
 	$retval = "[$cvstree]";
     }
     else {
-	$retval = $retval . " <a href=\"${scriptname}/${query}#dirlist\">[$cvstree]</a>";
+	$retval .= ' ' . &link("[$cvstree]", sprintf('%s/%s#dirlist',
+						     $scriptname,
+						     $query));
 	my $wherepath = '';
 	my ($lastslash) = $pathname =~ m|/$|;
 	foreach (split(/\//, $pathname)) {
-	    $retval = $retval . " / ";
-	    $wherepath = $wherepath . '/' . $_;
+	    $retval .= " / ";
+	    $wherepath .= "/$_";
 	    my ($last) = "$wherepath/" eq "/$pathname"
 		|| $wherepath eq "/$pathname";
 	    if ($clickLast || !$last) {
-		$retval = $retval . "<a href=\"${scriptname}"
-		    . urlencode($wherepath)
-		    . (!$last || $lastslash ? '/' : '')
-		    . ${query}
-	            . (!$last || $lastslash ? "#dirlist" : "")
-		    . "\">$_</a>";
+		$retval .= &link($_, join('',
+					  $scriptname,
+					  urlencode($wherepath),
+					  (!$last || $lastslash ? '/' : ''),
+					  $query,
+					  (!$last || $lastslash ? "#dirlist" : "")));
 	    }
 	    else { # do not make a link to the current dir
-		$retval = $retval .  $_;
+		$retval .= $_;
 	    }
 	}
     }
@@ -2518,8 +2778,7 @@ sub chooseCVSRoot() {
 	foreach $k (@foo) {
 	    print "<option value=\"$k\"";
 	    print " selected" if ($k eq $cvstree);
-	    print ">" . ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} :
-	    		$k). "</option>\n";
+	    print ">", ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} : $k), "</option>\n";
 	}
 	print "</select>\n</td>";
 	print "<td><input type=submit value=\"Go\"></td>";
@@ -2543,7 +2802,7 @@ sub chooseMirror() {
 	print "\nThis cvsweb is mirrored in:\n";
 	foreach $mirror (keys %MIRRORS) {
 	    print ", " if ($moremirrors);
-	    print qq(<a href="$MIRRORS{$mirror}">$mirror</A>\n);
+	    print &link(htmlquote($mirror),$MIRRORS{$mirror});
 	    $moremirrors = 1;
 	}
 	print "<p>\n";
@@ -2584,34 +2843,30 @@ sub fileSortCmp() {
 sub download_url($$;$) {
     my ($url,$revision,$mimetype) = @_;
 
-    $revision =~ s/\b0\.//;
+    $revision =~ s/\.0\././;
 
-    if (defined($checkout_magic)
+    if (defined($checkoutMagic)
 	&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {
-	my ($path);
-	($path = $where) =~ s|/[^/]*$|/|;
+	my $path = $where;
+	$path =~ s|/[^/]*$|/|;
 	$url = "$scriptname/$checkoutMagic/${path}$url";
     }
     $url .= "?rev=$revision";
-    $url .= "&amp;content-type=$mimetype" if (defined($mimetype));
+    $url .= '&content-type=' . urlencode($mimetype) if (defined($mimetype));
 
-    return $url;
+    $url;
 }
 
 # Presents a link to download the
 # selected revision
 sub download_link($$$;$) {
-    my ($url,$revision,$textlink,$mimetype) = @_;
-    my ($fullurl) = download_url($url,$revision,$mimetype);
-    my ($paren) = $textlink =~ /^\(/;
-    $textlink =~ s/^\(// if ($paren);
-    $textlink =~ s/\)$// if ($paren);
-    print "(" if ($paren);
-    print "<A HREF=\"$fullurl";
-    print $barequery;
-    print "\"";
+    my ($url, $revision, $textlink, $mimetype) = @_;
+    my ($fullurl) = download_url($url, $revision, $mimetype);
+
+    printf '<A HREF="%s"', htmlquote("$fullurl$barequery");
+
     if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {
-	print " target=\"cvs_checkout\"";
+	print ' target="cvs_checkout"';
 	# we should have
 	#   'if (document.cvswin==null) document.cvswin=window.open(...'
 	# in order to allow the user to resize the window; otherwise
@@ -2630,17 +2885,22 @@ sub download_link($$$;$) {
 	# currently, the best way is to comment out the size parameters
 	# ($extern_window...) in cvsweb.conf.
 	if ($use_java_script) {
-	    print " onClick=\"window.open('$fullurl','cvs_checkout',";
-	    print "'resizeable,scrollbars";
-	    print ",status,toolbar" if (defined($mimetype)
-	        && $mimetype eq "text/html");
-	    print ",width=$extern_window_width" if (defined($extern_window_width));
-	    print ",height=$extern_window_height" if (defined($extern_window_height));
-	    print"');\"";
+	    my @attr = qw(resizeable scrollbars);
+
+	    push @attr, qw(status toolbar)
+	      if (defined($mimetype) && $mimetype eq "text/html");
+
+	    push @attr, "width=$extern_window_width"
+	      if (defined($extern_window_width));
+
+	    push @attr, "height=$extern_window_height"
+	      if (defined($extern_window_height));
+
+	    printf q` onClick="window.open('%s','cvs_checkout','%s');"`,
+	      htmlquote($fullurl), join(',', @attr);
 	}
     }
     print "><b>$textlink</b></A>";
-    print ")" if ($paren);
 }
 
 # Returns a Query string with the
@@ -2662,7 +2922,7 @@ sub toggleQuery($$) {
 	my ($value) = defined($vars{$var}) ? $vars{$var} : "";
 	my ($default) = defined($DEFAULTVALUE{$var}) ? $DEFAULTVALUE{$var} : "";
 	if ($value ne $default) {
-	    $newquery .= "&amp;" if ($newquery ne "");
+	    $newquery .= "&" if ($newquery ne "");
 	    $newquery .= urlencode($var) . "=" . urlencode($value);
 	}
     }
@@ -2673,20 +2933,46 @@ sub toggleQuery($$) {
 }
 
 sub urlencode($) {
-    my ($in) = @_;
-    my ($out);
-    ($out = $in) =~ s/([\000-+{-\377])/sprintf("%%%02x", ord($1))/ge;
-    return $out;
+    local($_) = @_;
+
+    s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge;
+
+
+       $_;
 }
 
+sub htmlquote($) {
+    local($_) = @_;
+
+    # Special Characters; RFC 1866
+    s/&/&amp;/g;
+    s/\"/&quot;/g;
+    s/</&lt;/g;
+    s/>/&gt;/g;
+
+    $_;
+}
+
+sub htmlunquote($) {
+    local($_) = @_;
+
+    # Special Characters; RFC 1866
+    s/&quot;/\"/g;
+    s/&lt;/</g;
+    s/&gt;/>/g;
+    s/&amp;/&/g;
+
+    $_;
+}
+
 sub http_header(;$) {
     my $content_type = shift || "text/html";
     if (defined($moddate)) {
 	if ($is_mod_perl) {
-	    Apache->request->header_out(Last_modified => scalar gmtime($moddate) . " GMT");
+	    Apache->request->header_out("Last-Modified" => scalar gmtime($moddate) . " GMT");
 	}
 	else {
-	    print "Last-Modified: " . scalar gmtime($moddate) . " GMT\r\n";
+	    print "Last-Modified: ", scalar gmtime($moddate), " GMT\r\n";
 	}
     }
     if ($is_mod_perl) {
@@ -2696,8 +2982,7 @@ sub http_header(;$) {
 	    print "Content-type: $content_type\r\n";
     }
     if ($allow_compress && $maycompress) {
-	my $fh = do {local(*FH);};
-	if (defined($GZIPBIN) && open($fh, "|$GZIPBIN -1 -c")) {
+	if ($has_zlib || (defined($GZIPBIN) && open(GZIP, "|$GZIPBIN -1 -c"))) {
 	    if ($is_mod_perl) {
 		    Apache->request->content_encoding("x-gzip");
 		    Apache->request->header_out(Vary => "Accept-Encoding");
@@ -2709,7 +2994,11 @@ sub http_header(;$) {
 		    print "\r\n"; # Close headers
 	    }
 	    $| = 1; $| = 0; # Flush header output
-	    select ($fh);
+	    if ($has_zlib) {
+	    	tie *GZIP, __PACKAGE__, \*STDOUT;
+	    }
+	    select(GZIP);
+	    $gzip_open = 1;
 #	    print "<!-- gzipped -->" if ($content_type eq "text/html");
 	}
 	else {
@@ -2734,7 +3023,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.94 $  $Revision: 3.16 $'; #'
+    my $version = '$zRevision: 1.104 $  $Revision: 3.39 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
@@ -2762,10 +3051,9 @@ sub link_tags($) {
 
     foreach my $sym (split(", ", $tags)) {
 	$ret .= ",\n" if ($ret ne "");
-	$ret .= "<A HREF=\"$fileurl"
-		. toggleQuery('only_with_tag',$sym) . "\">$sym</A>";
+	$ret .= &link($sym, $fileurl . toggleQuery('only_with_tag',$sym));
     }
-    return $ret."\n";
+    return "$ret\n";
 }
 
 #
@@ -2779,4 +3067,83 @@ sub forbidden_module($) {
     }
 
     return 0;
+}
+
+# Close the GZIP handle remove the tie.
+
+sub gzipclose {
+	if ($gzip_open) {
+	    select(STDOUT);
+	    close(GZIP);
+	    untie *GZIP;
+	    $gzip_open = 0;
+	}
+}
+
+# implement a gzipped file handle via the Compress:Zlib compression
+# library.
+
+sub MAGIC1() { 0x1f }
+sub MAGIC2() { 0x8b }
+sub OSCODE() { 3    }
+
+sub TIEHANDLE {
+	my ($class, $out) = @_;
+	my ($d) = Compress::Zlib::deflateInit(-Level => Compress::Zlib::Z_BEST_COMPRESSION(),
+		-WindowBits => -Compress::Zlib::MAX_WBITS()) or return undef;
+	my ($o) = {
+		handle => $out,
+		dh => $d,
+		crc => 0,
+		len => 0,
+	};
+	my ($header) = pack("c10", MAGIC1, MAGIC2, Compress::Zlib::Z_DEFLATED(), 0,0,0,0,0,0, OSCODE);
+	print {$o->{handle}} $header;
+	return bless($o, $class);
+}
+
+sub PRINT {
+	my ($o) = shift;
+	my ($buf) = join(defined $, ? $, : "",@_);
+	my ($len) = length($buf);
+	my ($compressed, $status) = $o->{dh}->deflate($buf);
+	print {$o->{handle}} $compressed if defined($compressed);
+	$o->{crc} = Compress::Zlib::crc32($buf, $o->{crc});
+	$o->{len} += $len;
+	return $len;
+}
+
+sub PRINTF {
+	my ($o) = shift;
+	my ($fmt) = shift;
+	my ($buf) = sprintf($fmt, @_);
+	my ($len) = length($buf);
+	my ($compressed, $status) = $o->{dh}->deflate($buf);
+	print {$o->{handle}} $compressed if defined($compressed);
+	$o->{crc} = Compress::Zlib::crc32($buf, $o->{crc});
+	$o->{len} += $len;
+	return $len;
+}
+
+sub WRITE {
+	my ($o, $buf, $len, $off) = @_;
+	my ($compressed, $status) = $o->{dh}->deflate(substr($buf, 0, $len));
+	print {$o->{handle}} $compressed if defined($compressed);
+	$o->{crc} = Compress::Zlib::crc32(substr($buf, 0, $len), $o->{crc});
+	$o->{len} += $len;
+	return $len;
+}
+
+sub CLOSE {
+	my ($o) = @_;
+	return if !defined( $o->{dh});
+	my ($buf) = $o->{dh}->flush();
+	$buf .= pack("V V", $o->{crc}, $o->{len});
+	print {$o->{handle}} $buf;
+	undef $o->{dh};
+}
+
+sub DESTROY {
+	my ($o) = @_;
+	CLOSE($o);
 }