===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -p -r3.24 -r3.25
--- cvsweb/cvsweb.cgi 2000/09/19 20:07:16 3.24
+++ cvsweb/cvsweb.cgi 2000/09/21 15:30:04 3.25
@@ -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.101 2000/09/13 22:44:05 jumager Exp $
-# $Id: cvsweb.cgi,v 3.24 2000/09/19 20:07:16 knu Exp $
+# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
+# $Id: cvsweb.cgi,v 3.25 2000/09/21 15:30:04 knu Exp $
#
###
@@ -156,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 = undef;
+$tabstop = $use_moddate = $moddate = $gzip_open = undef;
##### End of configuration variables #####
@@ -209,7 +209,8 @@ $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 = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`
+$maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})
+ && $ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`)
|| $is_mozilla3)
&& !$is_msie
&& !($is_mod_perl && !$has_zlib));
@@ -782,18 +783,18 @@ elsif (-d $fullname) {
elsif (-f $fullname . ',v') {
if (defined($input{'rev'}) || $doCheckout) {
&doCheckout($fullname, $input{'rev'});
- close(GZIP) if ($gzip_open);
+ gzipclose();
exit;
}
if (defined($input{'annotate'}) && $allow_annotate) {
&doAnnotate($input{'annotate'});
- close(GZIP) if ($gzip_open);
+ gzipclose();
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);
+ gzipclose();
exit;
}
print("going to dolog($fullname)\n") if ($verbose);
@@ -816,7 +817,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);
+ gzipclose();
exit;
}
elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| &&
@@ -851,7 +852,7 @@ elsif (-d $fullname) {
&fatal("404 Not Found","$where: no such file or directory");
}
-close(GZIP) if ($gzip_open);
+gzipclose();
## End MAIN
sub printDiffSelect($) {
@@ -1522,7 +1523,7 @@ sub doDiff($$$$$$) {
if ($human_readable) {
http_header();
&human_readable_diff($fh, $rev2);
- close(GZIP) if ($gzip_open);
+ gzipclose();
exit;
}
else {
@@ -2467,7 +2468,7 @@ sub navigateHeader($$$$$) {
$swhere = urlencode($filename) if ($swhere eq "");
print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
print "\n\n";
- print '';
+ print '';
print "\n$path$filename - $title - $rev\n";
print "\n";
print "";
@@ -2822,7 +2823,7 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.101 $ $Revision: 3.24 $'; #'
+ my $version = '$zRevision: 1.103 $ $Revision: 3.25 $'; #'
http_header();
print <