4606. [port] Stop using experimental "Experimental keys on scalar"

                        feature of perl as it has been removed. [RT #45012]

(cherry picked from commit a14562e120a824caa7f9c11f24c4c50fbd873fe2)

diff --git a/CHANGES b/CHANGES
index afb3bffe60d9d3526f83c4c3767112596a26e045..9a2497bbb21f19a230e93468f19b28c4dfc4c912 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4606.  [port]          Stop using experimental "Experimental keys on scalar"
+                       feature of perl as it has been removed. [RT #45012]
+
 4604.  [bug]           Don't use ERR_load_crypto_strings() when building
                        with OpenSSL 1.1.0. [RT #45117]
 

diff --git a/bin/tests/system/statschannel/server-json.pl b/bin/tests/system/statschannel/server-json.pl
index 4c81edea1a341d8cbf6119013fe593e8133dbf8b..e87eda951060f445618d7be62f32b8c8ac64a0a6 100644 (file)
--- a/bin/tests/system/statschannel/server-json.pl
+++ b/bin/tests/system/statschannel/server-json.pl
@@ -24,12 +24,12 @@ my $text = do{local$/;<INPUT>};
 close(INPUT);
 
 my $ref = decode_json($text);
-foreach $key (keys $ref->{opcodes}) {
+foreach $key (keys %{$ref->{opcodes}}) {
     print "opcode " . $key . ": " . $ref->{opcodes}->{$key} . "\n";
 }
-foreach $key (keys $ref->{qtypes}) {
+foreach $key (keys %{$ref->{qtypes}}) {
     print "qtype " . $key . ": " . $ref->{qtypes}->{$key} . "\n";
 }
-foreach $key (keys $ref->{nsstats}) {
+foreach $key (keys %{$ref->{nsstats}}) {
     print "nsstat " . $key . ": " . $ref->{nsstats}->{$key} . "\n";
 }

diff --git a/bin/tests/system/statschannel/server-xml.pl b/bin/tests/system/statschannel/server-xml.pl
index 4887fc66116d1200476919a540af845cdd7cae40..d26378ca9b8bb11a8996d62bacac840202fd944d 100644 (file)
--- a/bin/tests/system/statschannel/server-xml.pl
+++ b/bin/tests/system/statschannel/server-xml.pl
@@ -22,7 +22,7 @@ use XML::Simple;
 my $ref = XMLin("xml.stats");
 my $counters = $ref->{server}->{counters};
 foreach $group (@$counters) {
-    foreach $key (keys $group->{counter}) {
+    foreach $key (keys %{$group->{counter}}) {
         print $group->{type} . " " . $key . ": ". $group->{counter}->{$key}->{content} . "\n";
     }
 }