Imported Upstream version 2.24

diff --git a/Changes b/Changes
index 80fef9692e26ec778c99d87d7f71171400cc6cca..585bdcaff0a64842ae65f2be0aa58edd5e6574c8 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,11 @@
 Revision history for XML-Simple
 
+2.24      2017-04-17 16:12:00+12:00 Pacific/Auckland
+  - fix typo in last commit with mistakenly removed some underscores
+  - don't initialise $XML::Simple::PREFERRED_PARSER to undef as a caller may
+    have already set it before loading XML::Simple and if not, it would have
+    defaulted to undef anyway (RT#118205 from Slaven Rezić)
+
 2.23      2017-04-17 15:49:14+12:00 Pacific/Auckland
   - another fix to the logic for detecting circular references (RT#114120 from
     Matthias Pitzl, also report from Erland Sommarskog)

diff --git a/META.json b/META.json
index 63e128988910ebc2ae5cad7e6ee6bcb3b30e99e6..d82ce986764e0d59a372f2e90cfead28150d5761 100644 (file)
--- a/META.json
+++ b/META.json
@@ -46,6 +46,6 @@
          "web" : "https://github.com/grantm/xml-simple"
       }
    },
-   "version" : "2.23"
+   "version" : "2.24"
 }
 

diff --git a/META.yml b/META.yml
index 24e2ef3f421fdf85cc130b83dccc33a71e99be01..0644a3de5382eb5629846b493adf2bc082441802 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -20,4 +20,4 @@ requires:
   perl: '5.008'
 resources:
   repository: git://github.com/grantm/xml-simple.git
-version: '2.23'
+version: '2.24'

diff --git a/Makefile.PL b/Makefile.PL
index 2b61c2daff7a10fec6f6254ad44a36c20ad3fe6c..624129baffe7f327d84d4743efb94daa7e0573e9 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -24,7 +24,7 @@ my %WriteMakefileArgs = (
   "TEST_REQUIRES" => {
     "Test::More" => "0.88"
   },
-  "VERSION" => "2.23",
+  "VERSION" => "2.24",
   "test" => {
     "TESTS" => "t/*.t"
   }

diff --git a/README b/README
index bf3e8a498286088f9bb8257c3350009a6aa8f57e..bfc72e855b983d34a2d81f787c5ad9ecc47c6d2d 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution XML-Simple,
-version 2.23:
+version 2.24:
 
   An API for simple XML files
 

diff --git a/dist.ini b/dist.ini
index e5e6646fa30e3ce4b788b2a8f284704991893300..67756e0912faf8543080b3371230cda5e523f241 100644 (file)
--- a/dist.ini
+++ b/dist.ini
@@ -1,6 +1,6 @@
 name             = XML-Simple
 author           = Grant McLean <grantm@cpan.org>
-version          = 2.23
+version          = 2.24
 license          = Perl_5
 copyright_holder = Grant McLean
 copyright_year   = 2015

diff --git a/lib/XML/Simple.pm b/lib/XML/Simple.pm
index 2c9c435ebb1df0e335b4c06d74ccad0f3b55a38b..c08df576b4db4281466fa687b39137dbffb882e1 100644 (file)
--- a/lib/XML/Simple.pm
+++ b/lib/XML/Simple.pm
@@ -1,5 +1,5 @@
 package XML::Simple;
-$XML::Simple::VERSION = '2.23';
+$XML::Simple::VERSION = '2.24';
 =head1 NAME
 
 XML::Simple - An API for simple XML files
@@ -54,7 +54,6 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $PREFERRED_PARSER);
 @ISA               = qw(Exporter);
 @EXPORT            = qw(XMLin XMLout);
 @EXPORT_OK         = qw(xml_in xml_out);
-$PREFERRED_PARSER  = undef;
 
 my %StrictMode     = ();
 
@@ -1431,8 +1430,8 @@ sub value_to_xml {
   my $refaddr = Scalar::Util::refaddr($ref);
   if($refaddr) {
     croak "circular data structures not supported"
-      if $self->{ancestors}->{$refaddr};
-    $self->{ancestors}->{$refaddr} = $ref;  # keep ref alive until we delete it
+      if $self->{_ancestors}->{$refaddr};
+    $self->{_ancestors}->{$refaddr} = $ref;  # keep ref alive until we delete it
   }
   else {
     if($named) {
@@ -1650,7 +1649,7 @@ sub value_to_xml {
   }
 
 
-  delete $self->{ancestors}->{$refaddr};
+  delete $self->{_ancestors}->{$refaddr};
 
   return(join('', @result));
 }