Permalink
Browse files

Made 5.8.8 the new minimum-required perl.

Also dropped the utf8_downgrade hack, which affected an xt test.
  • Loading branch information...
1 parent 1a92f35 commit 235afd8c7c7140b5a3eb837b1ec38c3cbb26c35e @rjray committed Jun 27, 2011
View
@@ -28,7 +28,7 @@
package Apache::RPC::Server;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use base qw(RPC::XML::Server);
@@ -50,7 +50,7 @@ BEGIN
%Apache::RPC::Server::SERVER_TABLE = ();
}
-our $VERSION = '1.37';
+our $VERSION = '1.38';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
sub version { return $Apache::RPC::Server::VERSION }
View
@@ -40,7 +40,7 @@
package Apache::RPC::Status;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw(%IS_INSTALLED $SERVER_VER $STARTED $PERL_VER $DEFAULT
@@ -63,7 +63,7 @@ $SERVER_CLASS = 'Apache::RPC::Server';
$STARTED = scalar localtime $^T;
$PERL_VER = $^V ? sprintf 'v%vd', $^V : $];
-our $VERSION = '1.11';
+our $VERSION = '1.12';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
#
View
@@ -22,13 +22,13 @@
package RPC::XML;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw(@EXPORT_OK %EXPORT_TAGS $VERSION $ERROR
%XMLMAP $XMLRE $ENCODING $FORCE_STRING_ENCODING $ALLOW_NIL
$DATETIME_REGEXP);
-use subs qw(time2iso8601 smart_encode utf8_downgrade);
+use subs qw(time2iso8601 smart_encode);
use base 'Exporter';
use Scalar::Util qw(blessed reftype);
@@ -47,11 +47,6 @@ BEGIN
# Allow the <nil /> extension?
$ALLOW_NIL = 0;
-
- # Cribbed from the UTF-8 fixes in HTTP::Message, this may be discardable
- # once full encoding support is in place:
- *utf8_downgrade = defined(&utf8::downgrade) ?
- \&utf8::downgrade : sub { };
}
@EXPORT_OK = qw(time2iso8601 smart_encode
@@ -63,7 +58,7 @@ BEGIN
RPC_NIL) ],
all => [ @EXPORT_OK ]);
-$VERSION = '1.52';
+$VERSION = '1.53';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
# Global error string
@@ -396,10 +391,9 @@ sub serialize
{
my ($self, $fh) = @_;
- my $str = $self->as_string;
- RPC::XML::utf8_downgrade($str);
-
+ utf8::downgrade(my $str = $self->as_string);
print {$fh} $str;
+
return;
}
@@ -409,7 +403,7 @@ sub length ## no critic (ProhibitBuiltinHomonyms)
{
my $self = shift;
- RPC::XML::utf8_downgrade(my $str = $self->as_string);
+ utf8::downgrade(my $str = $self->as_string);
return length $str;
}
@@ -824,7 +818,7 @@ sub serialize
for (keys %{$self})
{
($key = $_) =~ s/$RPC::XML::XMLRE/$RPC::XML::XMLMAP{$1}/ge;
- RPC::XML::utf8_downgrade($key);
+ utf8::downgrade($key);
print {$fh} "<member><name>$key</name><value>";
$self->{$_}->serialize($fh);
print {$fh} '</value></member>';
@@ -844,7 +838,7 @@ sub length ## no critic (ProhibitBuiltinHomonyms)
{
$len += 45; # For all the constant XML presence
$len += $self->{$key}->length;
- RPC::XML::utf8_downgrade($key);
+ utf8::downgrade($key);
$len += length $key;
}
@@ -1357,8 +1351,7 @@ sub as_string
sub serialize
{
my ($self, $fh) = @_;
- my $name = $self->{name};
- RPC::XML::utf8_downgrade($name);
+ utf8::downgrade(my $name = $self->{name});
print {$fh} qq(<?xml version="1.0" encoding="$RPC::XML::ENCODING"?>);
@@ -1380,7 +1373,8 @@ sub length ## no critic (ProhibitBuiltinHomonyms)
my $self = shift;
my $len = 100 + length $RPC::XML::ENCODING; # All the constant XML present
- $len += length $self->{name};
+ utf8::downgrade(my $name = $self->{name});
+ $len += length $name;
for (@{$self->{args}})
{
View
@@ -30,7 +30,7 @@
package RPC::XML::Client;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw($VERSION $COMPRESSION_AVAILABLE);
@@ -60,7 +60,7 @@ BEGIN
}
}
-$VERSION = '1.33';
+$VERSION = '1.34';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
###############################################################################
@@ -345,8 +345,7 @@ sub send_request ## no critic (ProhibitExcessComplexity)
else
{
# Treat the content strictly in-memory
- $content = $req->as_string;
- RPC::XML::utf8_downgrade($content);
+ utf8::downgrade($content = $req->as_string);
if ($do_compress)
{
$content = Compress::Zlib::compress($content);
View
@@ -28,7 +28,7 @@
package RPC::XML::Function;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw($VERSION);
@@ -37,7 +37,7 @@ use base qw(RPC::XML::Procedure);
use AutoLoader 'AUTOLOAD';
-$VERSION = '1.10';
+$VERSION = '1.11';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
###############################################################################
View
@@ -24,19 +24,19 @@
package RPC::XML::Method;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw($VERSION);
use base qw(RPC::XML::Procedure);
-$VERSION = '1.14';
+$VERSION = '1.15';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
1;
# This is now a skeleton, so it doesn't have a full POD section
-## no critic (Documentation::RequirePodSections)
+## no critic (RequirePodSections)
__END__
View
@@ -23,13 +23,13 @@
package RPC::XML::Parser;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw($VERSION);
use subs qw(new parse);
-$VERSION = '1.23';
+$VERSION = '1.24';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
###############################################################################
@@ -31,7 +31,7 @@
package RPC::XML::Parser::XMLLibXML;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw($VERSION %VALIDTYPES);
@@ -42,7 +42,7 @@ use base 'RPC::XML::Parser';
use Scalar::Util 'reftype';
use XML::LibXML;
-$VERSION = '1.15';
+$VERSION = '1.16';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
# This is to identify valid types that don't already have special handling
@@ -34,7 +34,7 @@
package RPC::XML::Parser::XMLParser;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw($VERSION);
@@ -98,7 +98,7 @@ use XML::Parser;
require RPC::XML;
-$VERSION = '1.24';
+$VERSION = '1.25';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
###############################################################################
@@ -27,7 +27,7 @@
package RPC::XML::ParserFactory;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw($VERSION %AVAILABLE $PARSER_CLASS);
@@ -37,7 +37,7 @@ use subs qw(import new register);
# critic policy, but can't be worked around:
## no critic (RequireCheckingReturnValueOfEval)
-$VERSION = '1.02';
+$VERSION = '1.03';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
# These are the known parsers supported, not including any that are specified
View
@@ -38,7 +38,7 @@
package RPC::XML::Procedure;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw($VERSION);
@@ -56,7 +56,7 @@ use RPC::XML 'smart_encode';
# This module also provides RPC::XML::Method
## no critic (ProhibitMultiplePackages)
-$VERSION = '1.22';
+$VERSION = '1.23';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
###############################################################################
View
@@ -64,7 +64,7 @@
package RPC::XML::Server;
-use 5.006001;
+use 5.008008;
use strict;
use warnings;
use vars qw($VERSION @ISA $INSTANCE $INSTALL_DIR %FAULT_TABLE @XPL_PATH
@@ -110,7 +110,7 @@ BEGIN
);
}
-$VERSION = '1.57';
+$VERSION = '1.58';
$VERSION = eval $VERSION; ## no critic (ProhibitStringyEval)
###############################################################################
@@ -2003,8 +2003,7 @@ sub process_request ## no critic (ProhibitExcessComplexity)
else
{
# Treat the content strictly in-memory
- $buf = $respxml->as_string;
- RPC::XML::utf8_downgrade($buf);
+ utf8::downgrade($buf = $respxml->as_string);
if ($do_compress)
{
$buf = Compress::Zlib::compress($buf);
View
@@ -12,7 +12,7 @@ pod_coverage_ok('Apache::RPC::Server' => { also_private => [ 'debug' ] } =>
'Apache::RPC::Server');
pod_coverage_ok('Apache::RPC::Status' => 'Apache::RPC::Status');
pod_coverage_ok('RPC::XML' =>
- { also_private => [ qr/^RPC_/, 'utf8_downgrade' ] },
+ { also_private => [ qr/^RPC_/ ] },
'RPC::XML');
pod_coverage_ok('RPC::XML::Client' => { also_private => [ qr/^compress/ ] } =>
'RPC::XML::Client');

0 comments on commit 235afd8

Please sign in to comment.