diff options
-rwxr-xr-x | htdocs/docs/install.html | 6 | ||||
-rwxr-xr-x | httpd/cgi-bin/check | 52 | ||||
-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 |
5 files changed, 29 insertions, 35 deletions
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html index 2dccfb4..9ebaf5e 100755 --- a/htdocs/docs/install.html +++ b/htdocs/docs/install.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: install.html,v 1.52 2009-06-29 18:21:16 ville Exp $" ---><!--#set var="date" value="\$Date: 2009-06-29 18:21:16 $" +<!--#set var="revision" value="\$Id: install.html,v 1.53 2009-06-29 20:30:47 ville Exp $" +--><!--#set var="date" value="\$Date: 2009-06-29 20:30:47 $" --><!--#set var="title" value="Installation Documentation for The W3C Markup Validation Service" --><!--#set var="relroot" value="../" --><!--#include virtual="../header.html" --> @@ -172,7 +172,7 @@ install Bundle::W3C::Validator <dd> IP address manipulation. </dd> - <dt><a href="http://search.cpan.org/dist/SGML-Parser-OpenSP/">SGML-Parser-OpenSP</a></dt> + <dt><a href="http://search.cpan.org/dist/SGML-Parser-OpenSP/">SGML-Parser-OpenSP</a> >= 0.991</dt> <dd> Interface to the <a href="#install-prereq-sp">OpenSP parser</a>. The Validator currently requires a specific version of this module, see <a href="#spo_cvs">details on getting S::P::O from CVS</a> above. </dd> diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 4aa948d..f871f2e 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.666 2009-06-29 20:22:43 ville Exp $ +# $Id: check,v 1.667 2009-06-29 20:30:47 ville Exp $ # # Disable buffering on STDOUT! $| = 1; @@ -44,27 +44,27 @@ package W3C::Validator::MarkupValidator; # polluting our namespace. # -use CGI 2.81 qw(-newstyle_urls -private_tempfiles redirect); -use CGI::Carp qw(carp croak fatalsToBrowser); -use Config::General 2.32 qw(); # Need 2.32 for <msg 0>, rt.cpan.org#17852 -use Encode qw(); -use Encode::Alias qw(); -use Encode::HanExtra qw(); # for some chinese character encodings, - # e.g gb18030 -use File::Spec::Functions qw(catfile); -use HTML::Encoding 0.52 qw(); -use HTML::Parser 3.24 qw(); # Need 3.24 for $p->parse($code_ref) -use HTML::Template 2.6 qw(); # Need 2.6 for path param, other things. -use HTTP::Headers::Util qw(); -use HTTP::Message 1.52 qw(); # Need 1.52 for decoded_content() -use HTTP::Request qw(); -use HTTP::Headers::Auth qw(); # Needs to be imported after other HTTP::*. -use JSON 2.00 qw(); -use SGML::Parser::OpenSP qw(); -use URI qw(); -use URI::Escape qw(uri_escape); -use XML::LibXML qw(); -use String::Approx qw(amatch adist adistr); +use CGI 2.81 qw(-newstyle_urls -private_tempfiles redirect); +use CGI::Carp qw(carp croak fatalsToBrowser); +use Config::General 2.32 qw(); # Need 2.32 for <msg 0>, rt.cpan.org#17852 +use Encode qw(); +use Encode::Alias qw(); +use Encode::HanExtra qw(); # for some chinese character encodings, + # e.g gb18030 +use File::Spec::Functions qw(catfile); +use HTML::Encoding 0.52 qw(); +use HTML::Parser 3.24 qw(); # Need 3.24 for $p->parse($code_ref) +use HTML::Template 2.6 qw(); # Need 2.6 for path param, other things. +use HTTP::Headers::Util qw(); +use HTTP::Message 1.52 qw(); # Need 1.52 for decoded_content() +use HTTP::Request qw(); +use HTTP::Headers::Auth qw(); # Needs to be imported after other HTTP::*. +use JSON 2.00 qw(); +use SGML::Parser::OpenSP 0.991 qw(); +use URI qw(); +use URI::Escape qw(uri_escape); +use XML::LibXML qw(); +use String::Approx qw(amatch adist adistr); ############################################################################### #### Constant definitions. #################################################### @@ -206,7 +206,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.666 $; + $VERSION = q$Revision: 1.667 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -1109,16 +1109,10 @@ sub dtd_validate (\$) { if (&is_xml($File)) { $catalog = catfile($CFG->{Paths}->{SGML}->{Library}, 'xml.soc'); push(@spopt, 'xml'); - # workaround for a bug in s:p:o 0.99 - # see http://www.w3.org/Bugs/Public/show_bug.cgi?id=798#c5 - push(@spopt, 'xml'); - # FIXME when fixed s:p:o gets released } else { # add warnings for shorttags push(@spopt, 'min-tag'); - # twice, ditto above re: s:p:o bug in 0.99 - push(@spopt, 'min-tag'); } $File->{ParserName} = $parser_name; diff --git a/misc/bundle/META.yml b/misc/bundle/META.yml index 0c02012..7f6f139 100644 --- a/misc/bundle/META.yml +++ b/misc/bundle/META.yml @@ -29,7 +29,7 @@ requires: LWP::UserAgent: 2.032 Net::hostent: 0 Net::IP: 0 - SGML::Parser::OpenSP: 0 + SGML::Parser::OpenSP: 0.991 Socket: 0 String::Approx: 0 URI: 0 diff --git a/misc/bundle/Makefile.PL b/misc/bundle/Makefile.PL index c1bc83e..e5f7915 100644 --- a/misc/bundle/Makefile.PL +++ b/misc/bundle/Makefile.PL @@ -28,7 +28,7 @@ WriteMakefile( LWP::UserAgent => 2.032, Net::hostent => 0, Net::IP => 0, - SGML::Parser::OpenSP => 0, + SGML::Parser::OpenSP => 0.991, Socket => 0, String::Approx => 0, URI => 0, diff --git a/misc/bundle/lib/Bundle/W3C/Validator.pm b/misc/bundle/lib/Bundle/W3C/Validator.pm index 9cc401b..e3b4c8a 100644 --- a/misc/bundle/lib/Bundle/W3C/Validator.pm +++ b/misc/bundle/lib/Bundle/W3C/Validator.pm @@ -41,7 +41,7 @@ C<perl -MCPAN -e "install Bundle::W3C::Validator"> LWP::UserAgent 2.032 Net::IP Net::hostent - SGML::Parser::OpenSP + SGML::Parser::OpenSP 0.991 Socket String::Approx URI |