diff options
| -rwxr-xr-x | htdocs/docs/install.html | 6 | ||||
| -rwxr-xr-x | httpd/cgi-bin/check | 10 | ||||
| -rw-r--r-- | misc/bundle/Makefile.PL | 2 | ||||
| -rw-r--r-- | misc/bundle/lib/Bundle/W3C/Validator.pm | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html index b43359d..125b36f 100755 --- a/htdocs/docs/install.html +++ b/htdocs/docs/install.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: install.html,v 1.63 2010-03-09 18:42:27 ville Exp $" ---><!--#set var="date" value="\$Date: 2010-03-09 18:42:27 $" +<!--#set var="revision" value="\$Id: install.html,v 1.64 2010-03-10 20:51:38 ville Exp $" +--><!--#set var="date" value="\$Date: 2010-03-10 20:51:38 $" --><!--#set var="title" value="Installation Documentation for The W3C Markup Validation Service" --><!--#set var="relroot" value="../" --><!--#include virtual="../header.html" --> @@ -180,7 +180,7 @@ install Bundle::W3C::Validator <dd> Library to handle URIs and escaping special characters in them. </dd> - <dt><a href="http://search.cpan.org/dist/XML-LibXML/">XML-LibXML</a> >= 1.69</dt> + <dt><a href="http://search.cpan.org/dist/XML-LibXML/">XML-LibXML</a> >= 1.70</dt> <dd> The Perl binding for <a href="http://xmlsoft.org/">libxml2</a>, used to check the syntax of XML-based document types. In addition to the diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 5357e06..b8e6966 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.772 2010-03-09 19:50:56 ville Exp $ +# $Id: check,v 1.773 2010-03-10 20:51:38 ville Exp $ # # We need Perl 5.8.0+. @@ -61,7 +61,7 @@ use JSON 2.00 qw(); use SGML::Parser::OpenSP 0.991 qw(); use URI qw(); use URI::Escape qw(uri_escape); -use XML::LibXML 1.69 qw(); # Need 1.69 for (working) structured errors +use XML::LibXML 1.70 qw(); # Need 1.70 for (working) structured errors ############################################################################### #### Constant definitions. #################################################### @@ -191,7 +191,7 @@ EOF # # Strings - $VERSION = q$Revision: 1.772 $; + $VERSION = q$Revision: 1.773 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # Read friendly error message file @@ -645,9 +645,7 @@ if (&is_xml($File)) { my $err; $err->{src} = '...'; # do this with show_open_entities()? $err->{line} = $err_obj->line(); - - # -> column() is available in XML::LibXML >= 1.69_2 - $err->{char} = eval { $err_obj->column() }; + $err->{char} = $err_obj->column(); $err->{num} = "libxml2-" . $err_obj->code(); $err->{type} = "E"; $err->{msg} = $err_obj->message(); diff --git a/misc/bundle/Makefile.PL b/misc/bundle/Makefile.PL index ee4bd7a..96dfef5 100644 --- a/misc/bundle/Makefile.PL +++ b/misc/bundle/Makefile.PL @@ -37,7 +37,7 @@ WriteMakefile( "Socket" => 0, "URI" => 0, "URI::Escape" => 0, - "XML::LibXML" => 1.69, + "XML::LibXML" => 1.70, # Optional: "Encode::JIS2K" => 0, diff --git a/misc/bundle/lib/Bundle/W3C/Validator.pm b/misc/bundle/lib/Bundle/W3C/Validator.pm index 9429218..0973ea5 100644 --- a/misc/bundle/lib/Bundle/W3C/Validator.pm +++ b/misc/bundle/lib/Bundle/W3C/Validator.pm @@ -47,7 +47,7 @@ C<perl -MCPAN -e "install Bundle::W3C::Validator"> Socket URI URI::Escape - XML::LibXML 1.69 + XML::LibXML 1.70 =head1 DESCRIPTION |