perl/modules/W3C/LinkChecker/bin checklink,3.24,3.25

Update of /sources/public/perl/modules/W3C/LinkChecker/bin
In directory hutz:/tmp/cvs-serv26678/bin

Modified Files:
	checklink 
Log Message:
Make sure default configuration options are set also when there is no
configuration file.  D'oh!  Thanks to Rafael Gieschke for the report.


Index: checklink
===================================================================
RCS file: /sources/public/perl/modules/W3C/LinkChecker/bin/checklink,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -d -r3.24 -r3.25
--- checklink	7 Apr 2004 22:08:34 -0000	3.24
+++ checklink	8 Apr 2004 17:14:39 -0000	3.25
@@ -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, 8 April 2004 13:14:44 UTC