diff options
-rwxr-xr-x | htdocs/docs/install.html | 6 | ||||
-rwxr-xr-x | httpd/cgi-bin/check | 11 | ||||
-rwxr-xr-x | httpd/cgi-bin/sendfeedback.pl | 9 | ||||
-rw-r--r-- | misc/bundle/META.yml | 2 | ||||
-rw-r--r-- | misc/bundle/Makefile.PL | 2 | ||||
-rw-r--r-- | misc/bundle/lib/Bundle/W3C/Validator.pm | 2 |
6 files changed, 15 insertions, 17 deletions
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html index 6d1cdad..8416595 100755 --- a/htdocs/docs/install.html +++ b/htdocs/docs/install.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: install.html,v 1.42 2009-01-04 12:11:07 ville Exp $" ---><!--#set var="date" value="\$Date: 2009-01-04 12:11:07 $" +<!--#set var="revision" value="\$Id: install.html,v 1.43 2009-01-04 16:54:17 ville Exp $" +--><!--#set var="date" value="\$Date: 2009-01-04 16:54:17 $" --><!--#set var="title" value="Installation Documentation for The W3C Markup Validation Service" --><!--#set var="relroot" value="../" --><!--#include virtual="../header.html" --> @@ -128,7 +128,7 @@ install Bundle::W3C::Validator takes care of all those niggly little bits of CGI for us and make options parsing and file upload a breeze. </dd> - <dt><a href="http://search.cpan.org/dist/Config-General/">Config-General</a> >= 2.19</dt> + <dt><a href="http://search.cpan.org/dist/Config-General/">Config-General</a> >= 2.31</dt> <dd> Configuration file handling. </dd> diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 9734cfc..898e954 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -14,7 +14,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.623 2009-01-04 12:30:49 ville Exp $ +# $Id: check,v 1.624 2009-01-04 16:54:19 ville Exp $ # # Disable buffering on STDOUT! @@ -47,7 +47,7 @@ package W3C::Validator::MarkupValidator; use CGI 2.81 qw(-newstyle_urls -private_tempfiles redirect); use CGI::Carp qw(carp croak fatalsToBrowser); -use Config::General 2.19 qw(); # Need 2.19 for -AutoLaunder +use Config::General 2.31 qw(); # Need 2.31 for (partial) <msg 0> sanity use Encode qw(); use Encode::Alias qw(); use Encode::HanExtra qw(); # for some chinese character encodings, @@ -198,7 +198,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.623 $; + $VERSION = q$Revision: 1.624 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -212,13 +212,12 @@ my %rsrc = Config::General->new( 'error_messages.cfg'), )->getall(); # 'en_US' should be replaced by $lang for lang-neg -# Config::General workarounds for <msg 0> issues: +# Config::General 2.31 workaround for <msg 0> issues: # http://lists.w3.org/Archives/Public/public-qa-dev/2006Feb/0022.html # http://lists.w3.org/Archives/Public/public-qa-dev/2006Feb/0025.html # https://rt.cpan.org/Public/Bug/Display.html?id=17852 $rsrc{msg}{0} ||= - delete($rsrc{'msg 0'}) || # < 2.31 - { original => delete($rsrc{msg}{original}), # 2.31 + { original => delete($rsrc{msg}{original}), verbose => delete($rsrc{msg}{verbose}), }; $RSRC = \%rsrc; diff --git a/httpd/cgi-bin/sendfeedback.pl b/httpd/cgi-bin/sendfeedback.pl index 3bba907..6936aaf 100755 --- a/httpd/cgi-bin/sendfeedback.pl +++ b/httpd/cgi-bin/sendfeedback.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -T ## ## feedback generator for W3C Markup Validation Service -# # $Id: sendfeedback.pl,v 1.9 2009-01-04 10:41:20 ville Exp $ +# # $Id: sendfeedback.pl,v 1.10 2009-01-04 16:54:19 ville Exp $ ## Pragmas. use strict; @@ -13,7 +13,7 @@ use warnings; use CGI qw(); use File::Spec::Functions qw(catfile); use HTML::Template 2.6 qw(); -use Config::General 2.19 qw(); # Need 2.19 for -AutoLaunder +use Config::General 2.31 qw(); # Need 2.31 for (partial) <msg 0> sanity use vars qw($DEBUG $CFG $RSRC $VERSION $HAVE_IPC_RUN); # Define global constants @@ -73,13 +73,12 @@ our %rsrc = Config::General->new( -ConfigFile => catfile($CFG->{Paths}->{Templates}, $lang, 'error_messages.cfg'), )->getall(); -# Config::General workarounds for <msg 0> issues: +# Config::General 2.31 workaround for <msg 0> issues: # http://lists.w3.org/Archives/Public/public-qa-dev/2006Feb/0022.html # http://lists.w3.org/Archives/Public/public-qa-dev/2006Feb/0025.html # https://rt.cpan.org/Public/Bug/Display.html?id=17852 $rsrc{msg}{0} ||= - delete($rsrc{'msg 0'}) || # < 2.31 - { original => delete($rsrc{msg}{original}), # 2.31 + { original => delete($rsrc{msg}{original}), verbose => delete($rsrc{msg}{verbose}), }; $RSRC = \%rsrc; diff --git a/misc/bundle/META.yml b/misc/bundle/META.yml index 6ab6248..44292e2 100644 --- a/misc/bundle/META.yml +++ b/misc/bundle/META.yml @@ -9,7 +9,7 @@ generated_by: ExtUtils::MakeMaker version 6.42 distribution_type: module requires: CGI: 2.81 - Config::General: 2.19 + Config::General: 2.31 Encode: 0 Encode::HanExtra: 0 Encode::JIS2K: 0 diff --git a/misc/bundle/Makefile.PL b/misc/bundle/Makefile.PL index 1f9d1c0..6f2f549 100644 --- a/misc/bundle/Makefile.PL +++ b/misc/bundle/Makefile.PL @@ -8,7 +8,7 @@ WriteMakefile( VERSION_FROM => 'lib/Bundle/W3C/Validator.pm', PREREQ_PM => { CGI => 2.81, - Config::General => 2.19, + Config::General => 2.31, Encode => 0, Encode::HanExtra => 0, Encode::JIS2K => 0, diff --git a/misc/bundle/lib/Bundle/W3C/Validator.pm b/misc/bundle/lib/Bundle/W3C/Validator.pm index 07b145a..2800a10 100644 --- a/misc/bundle/lib/Bundle/W3C/Validator.pm +++ b/misc/bundle/lib/Bundle/W3C/Validator.pm @@ -21,7 +21,7 @@ C<perl -MCPAN -e "install Bundle::W3C::Validator"> =head1 CONTENTS CGI 2.81 - Config::General 2.19 + Config::General 2.31 Encode Encode::HanExtra Encode::JIS2K |