- From: Terje Bless <link@hutz.w3.org>
- Date: Mon, 10 May 2004 01:41:55 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv18190
Modified Files:
check
Log Message:
Ditch &read_cfg (no longer used) and set -AutoLaunder on Config::General.
Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- check 9 May 2004 15:56:53 -0000 1.326
+++ check 10 May 2004 01:41:52 -0000 1.327
@@ -107,6 +107,7 @@
-UseApacheInclude => TRUE,
-IncludeRelative => TRUE,
-InterPolateVars => TRUE,
+ -AutoLaunder => TRUE,
-DefaultConfig => { Allowed_Protocols => 'http,https',
SGML_Parser => '/usr/bin/onsgmls',
Template_Path => '/usr/local/validator/share/templates/en_US',
@@ -192,43 +193,6 @@
#
# Use passive FTP by default.
$ENV{FTP_PASSIVE} = 1 unless exists($ENV{FTP_PASSIVE});
-
-
- #
- # Read TAB-delimited configuration files. Returns a hash reference.
- sub read_cfg {
- my $file = shift;
- my %cfg;
-
- my $fh = new IO::File $file;
- unless (defined $fh) {
- die <<".EOF.";
-open($file) returned: $!
-(Did you forget to set \$ENV{W3C_VALIDATOR_CFG}
- or to copy validator.conf to /etc/w3c/validator.conf?)
-.EOF.
- }
-
- while (<$fh>) {
- next if /^\s*$/;
- next if /^\s*\#/;
- chomp;
- my($k, $v) = split /\t+/, $_, 2;
- $v = '' unless defined $v;
-
- if ($v =~ s(^file://){}) {
- $cfg{$k} = &read_cfg($v);
- } elsif ($v =~ /,/) {
- $cfg{$k} = [split /,/, $v];
- } else {
- # Launder data for Perl 5.8+ taint mode, trusting the config...
- $v =~ /^(.*)$/;
- $cfg{$k} = $1;
- }
- }
- undef $fh;
- return \%cfg;
- }
} # end of BEGIN block.
#
Received on Sunday, 9 May 2004 22:41:34 UTC