===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.7
retrieving revision 3.18
diff -u -p -r1.1.1.7 -r3.18
--- cvsweb/cvsweb.cgi	2000/09/23 20:23:34	1.1.1.7
+++ cvsweb/cvsweb.cgi	2000/09/04 14:50:22	3.18
@@ -9,7 +9,6 @@
 #             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:
@@ -42,8 +41,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.94 2000/08/24 06:41:22 hnordstrom Exp $
+# $Id: cvsweb.cgi,v 3.18 2000/09/04 14:50:22 knu Exp $
 #
 ###
 
@@ -64,9 +63,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
@@ -78,21 +76,19 @@ use vars qw (
     $navigationHeaderColor $tableBorderColor $markupLogColor
     $tabstop $state $annTable $sel $curbranch @HideModules
     $module $use_descriptions %descriptions @mytz $dwhere $moddate
-    $use_moddate $has_zlib $gzip_open
+    $use_moddate
 );
 
 sub printDiffSelect($);
 sub findLastModifiedSubdirs(@);
 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($$$);
@@ -146,9 +142,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,20 +153,13 @@ $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 #####
 
 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} : '';
@@ -209,13 +197,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 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`)
+# 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`
 		 || $is_mozilla3)
 		&& !$is_msie
-		&& !($is_mod_perl && !$has_zlib));
+		&& !$is_mod_perl);
 
 # put here the variables we need in order
 # to hold our state - they will be added (with
@@ -371,7 +359,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 && !$has_zlib) {
+if ($allow_compress && $maycompress) {
     foreach (split(/:/, $ENV{PATH})) {
 	if (-x "$_/gzip") {
 	    $GZIPBIN = "$_/gzip";
@@ -722,8 +710,7 @@ elsif (-d $fullname) {
 	    foreach my $var (@stickyvars) {
 		print "<INPUT TYPE=HIDDEN NAME=\"$var\" VALUE=\"$input{$var}\">\n"
 		    if (defined($input{$var})
-			&& (!defined($DEFAULTVALUE{$var})
-			    || $input{$var} ne $DEFAULTVALUE{$var})
+			&& $input{$var} ne $DEFAULTVALUE{$var}
 			&& $input{$var} ne ""
 			&& $var ne "only_with_tag");
 	    }
@@ -785,18 +772,15 @@ 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);
@@ -819,7 +803,6 @@ 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| &&
@@ -853,8 +836,6 @@ elsif (-d $fullname) {
 	}
 	&fatal("404 Not Found","$where: no such file or directory");
     }
-
-gzipclose();
 ## End MAIN
 
 sub printDiffSelect($) {
@@ -915,52 +896,55 @@ sub htmlify($;$) {
 	$string =~ s/>/&gt;/g;
 
 	# 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;	# `
+	$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;	# `
+	$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`g;
 
 	if ($extra) {
 	    # get PR #'s as link ..
 	    if (defined($prcgi)) {
-		1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1 . &link($2, sprintf($prcgi, $2))`ie; # `
-		$string =~ s`\b${prcategories}/(\d+)\b`&link($&, sprintf($prcgi, $1))`igeo;	# `
+		1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`sprintf('%s<A HREF="%s">%s</A>', $1, sprintf($prcgi, $2), $2)`ie;
+		$string =~ s`\b${prcategories}/(\d+)\b`sprintf('<A HREF="%s">%s</A>', sprintf($prcgi, $1), $&)`igeo;
 	    }
 
 	    # get manpage specs as link ..
 	    if (defined($mancgi)) {
-		$string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`&link($&, sprintf($mancgi, $2, $1))`ge; # `
+		$string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`sprintf('<A HREF="%s">%s</A>', sprintf($mancgi, $2, $1), $&)`ge;
 	    }
 	}
 
 	return $string;
 }
 
-sub spacedHtmlText($;$) {
+sub spacedHtmlText($) {
 	local $_ = $_[0];
-	my $ts = $_[1] || $tabstop;
 
-	# Cut trailing spaces and tabs
-	s/[ \t]+$//;
+	# Cut trailing spaces
+	s/\s+$/\n/;
 
-        if (defined($ts)) {
-	    # Expand tabs
-	    1 while s/\t+/' ' x (length($&) * $ts - length($`) % $ts)/e
-	}
+	# Expand tabs
+	s/\t+/' ' x (length($&) * $tabstop - length($`) % $tabstop)/e
+	    if (defined($tabstop));
 
 	# 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 {
+	}
+	else {
+	    s/	/\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;/g;
 	    s/ /\001nbsp;/g;
 	}
 
 	$_ = htmlify($_);
 
 	# unescape
-	y/\001/&/;
+	s/\001([^%])/&$1/g;
+	s/\001%/\001/g;
 
 	return $_;
 }
@@ -1080,40 +1064,6 @@ 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($$) {
@@ -1214,15 +1164,7 @@ sub doAnnotate($$) {
     else {
 	print "<pre>";
     }
-
-    # prefetch several lines
-    my @buf = head($reader);
-
-    my %d = scan_directives(@buf);
-
-    while (@buf || !eof($reader)) {
-	$_ = @buf ? shift @buf : <$reader>;
-
+    while (<$reader>) {
 	my @words = split;
 	# Adding one is for the (single) space which follows $words[0].
 	my $rest = substr ($_, length ($words[0]) + 1);
@@ -1240,7 +1182,6 @@ sub doAnnotate($$) {
 	    }
 	    else {
 		$revprint = $lrev; $oldLusr = "";
-		$revprint =~ s`^(\S+)`<a href="${scriptwhere}${barequery}#rev$1">$1</A>`;	# `		
 	    }
 	    if ($lusr eq $oldLusr) {
 		$usrprint = "         ";
@@ -1256,7 +1197,7 @@ sub doAnnotate($$) {
 
 	    print "<b>" if ($isCurrentRev);
 	    printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);
-	    print spacedHtmlText($line, $d{'tabstop'});
+	    print spacedHtmlText($line);
 	    print "</b>" if ($isCurrentRev);
 	}
 	elsif ($words[0] eq "ok") {
@@ -1399,26 +1340,16 @@ 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>";
     }
-    elsif ($mimetype =~ m%^application/pdf%) {
-	print "<EMBED SRC=\"$url$barequery\" WIDTH=\"100%\"><BR>";
-    }
     else {
 	print "<PRE>";
-
-	# prefetch several lines
-	my @buf = head($filehandle);
-
-	my %d = scan_directives(@buf);
-
-	while (@buf || !eof($filehandle)) {
-	    $_ = @buf ? shift @buf : <$filehandle>;
-
-	    print spacedHtmlText($_, $d{'tabstop'});
+	foreach (@content) {
+	    print spacedHtmlText($_);
 	}
 	print "</PRE>";
     }
@@ -1427,7 +1358,7 @@ sub cvswebMarkup($$$) {
 sub viewable($) {
     my ($mimetype) = @_;
 
-    $mimetype =~ m%^((text|image)/|application/pdf)% ;
+    $mimetype =~ m%^(text|image)/%;
 }
 
 ###############################
@@ -1525,7 +1456,6 @@ sub doDiff($$$$$$) {
 	if ($human_readable) {
 	    http_header();
 	    &human_readable_diff($fh, $rev2);
-	    gzipclose();
 	    exit;
 	}
 	else {
@@ -2195,42 +2125,40 @@ EOF
         foreach (@stickyvars) {
 	    print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"
 		if (defined($input{$_})
-		    && ((!defined($DEFAULTVALUE{$_})
-		         || $input{$_} ne $DEFAULTVALUE{$_})
-		        && $input{$_} ne ""));
+		    && ($input{$_} ne $DEFAULTVALUE{$_} && $input{$_} ne ""));
 	}
-	print "<TABLE><TR>\n";
-	print "<TD align=right>Diffs between \n";
+	print "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'></TD>";
-	print "<TD><BR></TD></TR>\n";
-	print "<TR><TD align=right>and \n";
+	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'>\n";
+	print " 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'></TD>";
-	print "<TD><INPUT TYPE=SUBMIT VALUE=\"  Get Diffs  \"></TD>\n";
+	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 "</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";
@@ -2244,31 +2172,29 @@ EOF
 			&& $input{"only_with_tag"} eq $_);
 		print ">${_}\n";
 	    }
-	    print "</SELECT></TD><TD></TD></TR>\n";
+	    print "</SELECT>\n";
+	    print "<INPUT TYPE=SUBMIT VALUE=\"  View Branch  \">\n";
+	    print "</FORM>\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{$_})
-		    && (!defined($DEFAULTVALUE{$_})
-		        || $input{$_} ne $DEFAULTVALUE{$_})
+		if (defined($input{$_}) && $input{$_} ne $DEFAULTVALUE{$_}
 		    && $input{$_} ne "");
 	}
-	print "<TR><TD align=right>";
-	print "<A name=logsort></A>\n";
-	print "Sort log by:</TD>";
-	print "<TD><SELECT NAME=\"logsort\"";
+	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></TD>";
-	print "<TD><INPUT TYPE=SUBMIT VALUE=\"  Set  \"></TD>";
+	print "</SELECT>\n";
+	print "<INPUT TYPE=SUBMIT VALUE=\"  Sort  \">\n";
 	print "</FORM>\n";
-	print "</TR></TABLE>";
         print &html_footer;
 	print "</BODY></HTML>\n";
 }
@@ -2308,7 +2234,7 @@ sub flush_diff_rows($$$$) {
 # human_readable_diff(String revision_to_return_to);
 ##
 sub human_readable_diff($){
-  my ($difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd);
+  my ($i,$difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd);
   my ($fh, $rev) = @_;
   my ($date1, $date2, $r1d, $r2d, $r1r, $r2r, $rev1, $rev2, $sym1, $sym2);
   my (@rightCol, @leftCol);
@@ -2362,15 +2288,9 @@ 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%\">";
@@ -2386,7 +2306,7 @@ sub human_readable_diff($){
       }
       else {
 	  ($diffcode,$rest) = $difftxt =~ /^([-+ ])(.*)/;
-	  $_ = spacedHtmlText($rest, $d{'tabstop'});
+	  $_ = spacedHtmlText ($rest);
 
 	  # Add fontface, size
 	  $_ = "$fs&nbsp;$_$fe";
@@ -2470,9 +2390,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.94 $  $Revision: 3.18 $ -->';
     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";
@@ -2771,7 +2691,7 @@ 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";
@@ -2784,7 +2704,8 @@ sub http_header(;$) {
 	    print "Content-type: $content_type\r\n";
     }
     if ($allow_compress && $maycompress) {
-	if ($has_zlib || (defined($GZIPBIN) && open(GZIP, "|$GZIPBIN -1 -c"))) {
+	my $fh = do {local(*FH);};
+	if (defined($GZIPBIN) && open($fh, "|$GZIPBIN -1 -c")) {
 	    if ($is_mod_perl) {
 		    Apache->request->content_encoding("x-gzip");
 		    Apache->request->header_out(Vary => "Accept-Encoding");
@@ -2796,11 +2717,7 @@ sub http_header(;$) {
 		    print "\r\n"; # Close headers
 	    }
 	    $| = 1; $| = 0; # Flush header output
-	    if ($has_zlib) {
-	    	tie *GZIP, __PACKAGE__, \*STDOUT;
-	    }
-	    select(GZIP);
-	    $gzip_open = 1;
+	    select ($fh);
 #	    print "<!-- gzipped -->" if ($content_type eq "text/html");
 	}
 	else {
@@ -2825,7 +2742,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.103 $  $kRevision: 1.26 $'; #'
+    my $version = '$zRevision: 1.94 $  $Revision: 3.18 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
@@ -2870,83 +2787,4 @@ 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);
 }