diff options
| -rwxr-xr-x | htdocs/docs/install.html | 2 | ||||
| -rwxr-xr-x | httpd/cgi-bin/check | 21 | ||||
| -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, 5 insertions, 24 deletions
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html index 1f5cd97..a6b0def 100755 --- a/htdocs/docs/install.html +++ b/htdocs/docs/install.html @@ -178,7 +178,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.70</dt> + <dt><a href="http://search.cpan.org/dist/XML-LibXML/">XML-LibXML</a> >= 1.73</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 274b2cd..94288d0 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -220,7 +220,7 @@ EOF local $ENV{XML_CATALOG_FILES} = catfile($CFG->{Paths}->{SGML}->{Library}, 'catalog.xml'); require XML::LibXML; - XML::LibXML->VERSION(1.70); # Need 1.70 for (working) structured errors + XML::LibXML->VERSION(1.73); # Need 1.73 for rt.cpan.org #66642 } # end of BEGIN block. @@ -1331,25 +1331,6 @@ sub xmlwf (\$) $err->{type} = "E"; $err->{msg} = $err_obj->message(); - # Ugly workaround for XML::LibXML reporting column 80 when the - # error occurs beyond that: - # http://rt.cpan.org/Public/Bug/Display.html?id=66642 - if ($err->{char} && $err->{char} == 80 && - # This workaround does not apply to non-document errors, i.e. - # ones that have $err->{uri}. - !$err->{uri} && $err->{line}) - { - # Get context reported by XML::LibXML, ... - my $ctx = $err_obj->context(); - if ($ctx && length($ctx) == $err->{char}) { - # ... try to locate it in our original source line, ... - my $line = $File->{Content}->[$err->{line}-1] || ''; - my $ix = index($line, $ctx); - # ... and adjust column offset accordingly. - $err->{char} += $ix if $ix > 0; - } - } - $err_obj = $err_obj->_prev(); unshift(@{$File->{WF_Errors}}, $err); diff --git a/misc/bundle/META.yml b/misc/bundle/META.yml index 05296f0..c287c24 100644 --- a/misc/bundle/META.yml +++ b/misc/bundle/META.yml @@ -40,7 +40,7 @@ requires: URI::Escape: 0 URI::file: 0 URI::Heuristic: 0 - XML::LibXML: 1.70 + XML::LibXML: 1.73 resources: bugtracker: http://www.w3.org/Bugs/Public/ homepage: http://validator.w3.org/ diff --git a/misc/bundle/Makefile.PL b/misc/bundle/Makefile.PL index feb9afb..6d06b26 100644 --- a/misc/bundle/Makefile.PL +++ b/misc/bundle/Makefile.PL @@ -40,7 +40,7 @@ WriteMakefile( "URI::Escape" => 0, "URI::file" => 0, "URI::Heuristic" => 0, - "XML::LibXML" => "1.70", + "XML::LibXML" => 1.73, # Optional: "Encode::JIS2K" => 0, diff --git a/misc/bundle/lib/Bundle/W3C/Validator.pm b/misc/bundle/lib/Bundle/W3C/Validator.pm index c87b381..09f8e5c 100644 --- a/misc/bundle/lib/Bundle/W3C/Validator.pm +++ b/misc/bundle/lib/Bundle/W3C/Validator.pm @@ -50,7 +50,7 @@ C<perl -MCPAN -e "install Bundle::W3C::Validator"> URI::Escape URI::file URI::Heuristic - XML::LibXML 1.70 + XML::LibXML 1.73 =head1 DESCRIPTION |