Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:chorny/XML-Parser

  • Loading branch information...
commit 2ee89079bb788a4b1427a620b6aa47ef96c649bd 2 parents d971407 + fd51a6c
@chorny authored
View
33 .gitignore
@@ -1,15 +1,18 @@
-blib*
-Makefile
-Makefile.old
-Build
-_build*
-pm_to_blib*
-*.tar.gz
-.lwpcookies
-XML-Parser-*
-cover_db
-Build.bat
-*.tmp
-
-META.yml
-MYMETA.yml
+blib*
+Makefile
+Makefile.old
+Build
+_build*
+pm_to_blib*
+*.tar.gz
+.lwpcookies
+XML-Parser-*
+cover_db
+Build.bat
+*.tmp
+*.orig
+META.yml
+MYMETA.yml
+Expat/Expat.bs
+Expat/Expat.c
+Expat/Expat.o
View
4 Changes
@@ -1,5 +1,9 @@
Revision history for Perl extension XML::Parser.
+2.40_02 2011-05-31 (by Todd Rinaldo)
+ - TODO some tests which fail in Free BSD due to improper expat CVE patch
+ http://www.freebsd.org/cgi/query-pr.cgi?pr=157469
+
2.40_01 2011-05-24 (by Todd Rinaldo)
- better installation instructions
- Small spelling patches from Debian package - Thanks Nicholas Bamber
View
2  Expat/Expat.pm
@@ -10,7 +10,7 @@ use Carp;
require DynaLoader;
@ISA = qw(DynaLoader);
-$VERSION = "2.40_01";
+$VERSION = "2.40_02";
$have_File_Spec = $INC{'File/Spec.pm'} || do 'File/Spec.pm';
View
2  Parser.pm
@@ -16,7 +16,7 @@ use Carp;
BEGIN {
require XML::Parser::Expat;
- $VERSION = '2.40_01';
+ $VERSION = '2.40_02';
die "Parser.pm and Expat.pm versions don't match"
unless $VERSION eq $XML::Parser::Expat::VERSION;
}
View
8 t/decl.t
@@ -69,7 +69,13 @@ my $parser = new XML::Parser(ErrorContext => 2,
ParseParamEnt => 1,
Handlers => {Entity => \&enth1});
-$parser->parse($docstr);
+eval { $parser->parse($docstr) };
+if($@ && $^O =~ m/freebsd/i) {
+ for(2..30) {
+ print "not ok $_ - Cannot test due to Free BSD PR 157469 # TODO: Waiting for Free BSD fix in expat\n";
+ }
+ exit;
+}
sub eleh {
my ($p, $name, $model) = @_;
View
8 t/parament.t
@@ -82,7 +82,13 @@ $p = new XML::Parser(ParseParamEnt => 1,
}
);
-$p->parse($doc);
+eval { $p->parse($doc) };
+if($@ && $^O =~ m/freebsd/i) {
+ for(2..12) {
+ print "not ok $_ - Cannot test due to Free BSD PR 157469 # TODO: Waiting for Free BSD fix in expat\n";
+ }
+ exit;
+}
print "not " unless $gotmore;
print "ok 6\n";

0 comments on commit 2ee8907

Please sign in to comment.
Something went wrong with that request. Please try again.