===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.18
retrieving revision 3.23
diff -u -p -r3.18 -r3.23
--- cvsweb/cvsweb.cgi	2000/09/04 14:50:22	3.18
+++ cvsweb/cvsweb.cgi	2000/09/19 19:57:58	3.23
@@ -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.18 2000/09/04 14:50:22 knu Exp $
+# $zId: cvsweb.cgi,v 1.101 2000/09/13 22:44:05 jumager Exp $
+# $Id: cvsweb.cgi,v 3.23 2000/09/19 19:57:58 knu Exp $
 #
 ###
 
@@ -76,13 +77,13 @@ use vars qw (
     $navigationHeaderColor $tableBorderColor $markupLogColor
     $tabstop $state $annTable $sel $curbranch @HideModules
     $module $use_descriptions %descriptions @mytz $dwhere $moddate
-    $use_moddate
+    $use_moddate $has_zlib $gzip_open
 );
 
 sub printDiffSelect($);
 sub findLastModifiedSubdirs(@);
 sub htmlify($;$);
-sub spacedHtmlText($);
+sub spacedHtmlText($;$);
 sub link($$);
 sub revcmp($$);
 sub fatal($$);
@@ -160,6 +161,13 @@ $tabstop = $use_moddate = $moddate = undef;
 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} : '';
@@ -197,13 +205,12 @@ $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.
+# Turn off gzip if running under mod_perl and no zlib is available,
+# piping does not work as expected inside the server.
 $maycompress = (($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
@@ -359,7 +366,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";
@@ -710,7 +717,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");
 	    }
@@ -772,15 +780,18 @@ elsif (-d $fullname) {
     elsif (-f $fullname . ',v') {
 	if (defined($input{'rev'}) || $doCheckout) {
 	    &doCheckout($fullname, $input{'rev'});
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	if (defined($input{'annotate'}) && $allow_annotate) {
 	    &doAnnotate($input{'annotate'});
+	    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'});
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	print("going to dolog($fullname)\n") if ($verbose);
@@ -803,6 +814,7 @@ elsif (-d $fullname) {
 	# e.g. foo.c
 	&doDiff($fullname, $input{'r1'}, $input{'tr1'},
 		$input{'r2'}, $input{'tr2'}, $input{'f'});
+	close(GZIP) if ($gzip_open);
 	exit;
     }
     elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| &&
@@ -836,6 +848,8 @@ elsif (-d $fullname) {
 	}
 	&fatal("404 Not Found","$where: no such file or directory");
     }
+
+close(GZIP) if ($gzip_open);
 ## End MAIN
 
 sub printDiffSelect($) {
@@ -896,55 +910,52 @@ 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`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;
+		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;	# `
 	    }
 
 	    # get manpage specs as link ..
 	    if (defined($mancgi)) {
-		$string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`sprintf('<A HREF="%s">%s</A>', sprintf($mancgi, $2, $1), $&)`ge;
+		$string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`&link($&, sprintf($mancgi, $2, $1))`ge; # `
 	    }
 	}
 
 	return $string;
 }
 
-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 $_;
 }
@@ -1182,6 +1193,7 @@ sub doAnnotate($$) {
 	    }
 	    else {
 		$revprint = $lrev; $oldLusr = "";
+		$revprint =~ s`^(\S+)`<a href="${scriptwhere}${barequery}#rev$1">$1</A>`;	# `		
 	    }
 	    if ($lusr eq $oldLusr) {
 		$usrprint = "         ";
@@ -1346,6 +1358,9 @@ sub cvswebMarkup($$$) {
     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>";
 	foreach (@content) {
@@ -1358,7 +1373,7 @@ sub cvswebMarkup($$$) {
 sub viewable($) {
     my ($mimetype) = @_;
 
-    $mimetype =~ m%^(text|image)/%;
+    $mimetype =~ m%^((text|image)/|application/pdf)% ;
 }
 
 ###############################
@@ -1456,6 +1471,7 @@ sub doDiff($$$$$$) {
 	if ($human_readable) {
 	    http_header();
 	    &human_readable_diff($fh, $rev2);
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	else {
@@ -2125,40 +2141,42 @@ EOF
         foreach (@stickyvars) {
 	    print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"
 		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";
@@ -2172,29 +2190,31 @@ 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 "<TR><TD align=right>";
+	print "<A name=logsort></A>\n";
+	print "Sort log by:</TD>";
+	print "<TD><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 "</SELECT></TD>";
+	print "<TD><INPUT TYPE=SUBMIT VALUE=\"  Set  \"></TD>";
 	print "</FORM>\n";
+	print "</TR></TABLE>";
         print &html_footer;
 	print "</BODY></HTML>\n";
 }
@@ -2390,7 +2410,7 @@ 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.18 $ -->';
+    print '<!-- CVSweb $zRevision: 1.101 $  $Revision: 3.23 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
     print  "<BODY BGCOLOR=\"$backcolor\">\n";
     print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
@@ -2691,7 +2711,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";
@@ -2704,8 +2724,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");
@@ -2717,7 +2736,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 {
@@ -2742,7 +2765,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.94 $  $Revision: 3.18 $'; #'
+    my $version = '$zRevision: 1.101 $  $Revision: 3.23 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
@@ -2787,4 +2810,72 @@ sub forbidden_module($) {
     }
 
     return 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);
 }