- From: Mercurial notifier <nobody@w3.org>
- Date: Thu, 05 Aug 2010 14:46:56 +0000
- To: link-checker updates <www-validator-cvs@w3.org>
changeset: 45:396e9fc74893
user: ville
date: Thu Apr 08 17:14:39 2004 +0000
files: bin/checklink
description:
Make sure default configuration options are set also when there is no
configuration file. D'oh! Thanks to Rafael Gieschke for the report.
diff -r 73bdd57cab9b -r 396e9fc74893 bin/checklink
--- a/bin/checklink Wed Apr 07 22:08:34 2004 +0000
+++ b/bin/checklink Thu Apr 08 17:14:39 2004 +0000
@@ -5,7 +5,7 @@
# (c) 1999-2004 World Wide Web Consortium
# based on Renaud Bruyeron's checklink.pl
#
-# $Id: checklink,v 3.24 2004-04-07 22:08:34 ville Exp $
+# $Id: checklink,v 3.25 2004-04-08 17:14:39 ville Exp $
#
# This program is licensed under the W3C(r) Software License:
# http://www.w3.org/Consortium/Legal/copyright-software
@@ -112,7 +112,7 @@
$PACKAGE = 'W3C Link Checker';
$PROGRAM = 'W3C-checklink';
$VERSION = '3.9.3-dev';
- my ($cvsver) = q$Revision: 3.24 $ =~ /(\d+[\d\.]*\.\d+)/;
+ my ($cvsver) = q$Revision: 3.25 $ =~ /(\d+[\d\.]*\.\d+)/;
$REVISION = sprintf('version %s [%s] (c) 1999-2004 W3C',
$VERSION, $cvsver);
$AGENT = sprintf('%s/%s [%s] %s',
@@ -145,14 +145,9 @@
my $conffile = $ENV{W3C_CHECKLINK_CFG} || $defaultconfig;
eval {
my %config_opts =
- ( -ConfigFile => $conffile,
- -SplitPolicy => 'equalsign',
- -DefaultConfig => {
- Markup_Validator_URI
- => 'http://validator.w3.org/check?uri=%s',
- CSS_Validator_URI
- => 'http://jigsaw.w3.org/css-validator/validator?uri=%s',
- },
+ ( -ConfigFile => $conffile,
+ -SplitPolicy => 'equalsign',
+ -AllowMultiOptions => 'no',
);
%Cfg = Config::General->new(%config_opts)->getall();
};
@@ -163,6 +158,10 @@
.EOF.
}
}
+ $Cfg{Markup_Validator_URI} ||=
+ 'http://validator.w3.org/check?uri=%s';
+ $Cfg{CSS_Validator_URI} ||=
+ 'http://jigsaw.w3.org/css-validator/validator?uri=%s';
# Trusted environment variables that need laundering in taint mode.
foreach (qw(NNTPSERVER NEWSHOST)) {
Received on Thursday, 5 August 2010 14:46:57 UTC