===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.7
retrieving revision 3.24
diff -u -p -r1.1.1.7 -r3.24
--- cvsweb/cvsweb.cgi	2000/09/23 20:23:34	1.1.1.7
+++ cvsweb/cvsweb.cgi	2000/09/19 20:07:16	3.24
@@ -42,8 +42,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
-# $kId: cvsweb.cgi,v 1.26 2000/09/22 11:13:17 knu Exp $
+# $zId: cvsweb.cgi,v 1.101 2000/09/13 22:44:05 jumager Exp $
+# $Id: cvsweb.cgi,v 3.24 2000/09/19 20:07:16 knu Exp $
 #
 ###
 
@@ -64,9 +64,8 @@ use vars qw (
     $bylog $byfile $hr_default $logsort $cvstree $cvsroot
     $mimetype $defaultTextPlain $defaultViewable $allow_compress
     $GZIPBIN $backicon $diricon $fileicon $fullname $newname
-    $cvstreedefault $body_tag $body_tag_for_src
-    $logo $defaulttitle $address
-    $long_intro $short_instruction $shortLogLen
+    $cvstreedefault $body_tag $logo $defaulttitle $address
+    $backcolor $long_intro $short_instruction $shortLogLen
     $show_author $dirtable $tablepadding $columnHeaderColorDefault
     $columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite
     $hr_ignkeysubst $diffcolorHeading $diffcolorEmpty $diffcolorRemove
@@ -146,9 +145,8 @@ $allow_version_select = 1;
 # These are defined to allow checking with perl -cw
 %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =
 %tags = %alltags = @tabcolors = ();
-$cvstreedefault = $body_tag = $body_tag_for_src = 
-$logo = $defaulttitle = $address =
-$long_intro = $short_instruction = $shortLogLen =
+$cvstreedefault = $body_tag = $logo = $defaulttitle = $address =
+$backcolor = $long_intro = $short_instruction = $shortLogLen =
 $show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =
 $columnHeaderColorSorted = $hr_breakable = $showfunc = $hr_ignwhite =
 $hr_ignkeysubst = $diffcolorHeading = $diffcolorEmpty = $diffcolorRemove =
@@ -158,7 +156,7 @@ $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 =
 $navigationHeaderColor = $tableBorderColor = $markupLogColor =
-$tabstop = $use_moddate = $moddate = $gzip_open = undef;
+$tabstop = $use_moddate = $moddate = undef;
 
 ##### End of configuration variables #####
 
@@ -211,8 +209,7 @@ $nofilelinks = $is_textbased;
 # display garbage then :-/
 # 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`)
+$maycompress = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`
 		 || $is_mozilla3)
 		&& !$is_msie
 		&& !($is_mod_perl && !$has_zlib));
@@ -785,18 +782,18 @@ elsif (-d $fullname) {
     elsif (-f $fullname . ',v') {
 	if (defined($input{'rev'}) || $doCheckout) {
 	    &doCheckout($fullname, $input{'rev'});
-	    gzipclose();
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	if (defined($input{'annotate'}) && $allow_annotate) {
 	    &doAnnotate($input{'annotate'});
-	    gzipclose();
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	if (defined($input{'r1'}) && defined($input{'r2'})) {
 	    &doDiff($fullname, $input{'r1'}, $input{'tr1'},
 		    $input{'r2'}, $input{'tr2'}, $input{'f'});
-	    gzipclose();
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	print("going to dolog($fullname)\n") if ($verbose);
@@ -819,7 +816,7 @@ elsif (-d $fullname) {
 	# e.g. foo.c
 	&doDiff($fullname, $input{'r1'}, $input{'tr1'},
 		$input{'r2'}, $input{'tr2'}, $input{'f'});
-	gzipclose();
+	close(GZIP) if ($gzip_open);
 	exit;
     }
     elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| &&
@@ -854,7 +851,7 @@ elsif (-d $fullname) {
 	&fatal("404 Not Found","$where: no such file or directory");
     }
 
-gzipclose();
+close(GZIP) if ($gzip_open);
 ## End MAIN
 
 sub printDiffSelect($) {
@@ -1525,7 +1522,7 @@ sub doDiff($$$$$$) {
 	if ($human_readable) {
 	    http_header();
 	    &human_readable_diff($fh, $rev2);
-	    gzipclose();
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	else {
@@ -2470,9 +2467,9 @@ 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.103 $  $kRevision: 1.26 $ -->';
+    print '<!-- CVSweb $zRevision: 1.101 $  $Revision: 3.24 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
-    print  "$body_tag_for_src\n";
+    print  "<BODY BGCOLOR=\"$backcolor\">\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";
@@ -2825,7 +2822,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.103 $  $kRevision: 1.26 $'; #'
+    my $version = '$zRevision: 1.101 $  $Revision: 3.24 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
@@ -2870,17 +2867,6 @@ 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