===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.24
retrieving revision 3.28
diff -u -p -r3.24 -r3.28
--- cvsweb/cvsweb.cgi 2000/09/19 20:07:16 3.24
+++ cvsweb/cvsweb.cgi 2000/09/30 18:27:16 3.28
@@ -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.28 2000/09/30 18:27:16 knu Exp $
#
###
@@ -64,8 +64,9 @@ use vars qw (
$bylog $byfile $hr_default $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
@@ -124,14 +125,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 ==
@@ -145,8 +145,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 =
@@ -156,7 +157,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 +210,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));
@@ -221,9 +223,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
%s
',
+ $config, &htmlify($@)));
+} else {
&fatal("500 Internal Error",
'Configuration not found. Set the variable $config
'
. 'in cvsweb.cgi, or the environment variable '
@@ -352,8 +356,15 @@ foreach my $k (keys %ICONS) {
}
}
+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
%s
',
+ $config_cvstree, &htmlify($@)));
+}
$prcategories = '(?:' . join('|', @prcategories) . ')';
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
@@ -782,18 +793,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 +827,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 +862,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 +1533,7 @@ sub doDiff($$$$$$) {
if ($human_readable) {
http_header();
&human_readable_diff($fh, $rev2);
- close(GZIP) if ($gzip_open);
+ gzipclose();
exit;
}
else {
@@ -2467,9 +2478,9 @@ sub navigateHeader($$$$$) {
$swhere = urlencode($filename) if ($swhere eq "");
print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
print "\n