From 180df315c789be1138ce2643583362f4b37c8809 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 21 Feb 2016 22:43:29 +0100 Subject: [PATCH] Don't use 'parent' in util/dofile.pl Because we're requiring Perl 5.10.0 and the 'parent' didn't appear before Perl 5.10.1, we need to resort to the older parent module declaration style, modifying @ISA. Reviewed-by: Andy Polyakov --- util/TLSProxy/ClientHello.pm | 3 ++- util/TLSProxy/NewSessionTicket.pm | 3 ++- util/TLSProxy/ServerHello.pm | 3 ++- util/TLSProxy/ServerKeyExchange.pm | 3 ++- util/dofile.pl | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/util/TLSProxy/ClientHello.pm b/util/TLSProxy/ClientHello.pm index 383062842c..0586cf9a54 100644 --- a/util/TLSProxy/ClientHello.pm +++ b/util/TLSProxy/ClientHello.pm @@ -55,7 +55,8 @@ use strict; package TLSProxy::ClientHello; -use parent 'TLSProxy::Message'; +use vars '@ISA'; +push @ISA, 'TLSProxy::Message'; sub new { diff --git a/util/TLSProxy/NewSessionTicket.pm b/util/TLSProxy/NewSessionTicket.pm index 75dbf23234..4e8c713811 100644 --- a/util/TLSProxy/NewSessionTicket.pm +++ b/util/TLSProxy/NewSessionTicket.pm @@ -54,7 +54,8 @@ use strict; package TLSProxy::NewSessionTicket; -use parent 'TLSProxy::Message'; +use vars '@ISA'; +push @ISA, 'TLSProxy::Message'; sub new { diff --git a/util/TLSProxy/ServerHello.pm b/util/TLSProxy/ServerHello.pm index 7cf753508d..4798f22140 100644 --- a/util/TLSProxy/ServerHello.pm +++ b/util/TLSProxy/ServerHello.pm @@ -55,7 +55,8 @@ use strict; package TLSProxy::ServerHello; -use parent 'TLSProxy::Message'; +use vars '@ISA'; +push @ISA, 'TLSProxy::Message'; sub new { diff --git a/util/TLSProxy/ServerKeyExchange.pm b/util/TLSProxy/ServerKeyExchange.pm index b85b8addca..a3973be962 100644 --- a/util/TLSProxy/ServerKeyExchange.pm +++ b/util/TLSProxy/ServerKeyExchange.pm @@ -55,7 +55,8 @@ use strict; package TLSProxy::ServerKeyExchange; -use parent 'TLSProxy::Message'; +use vars '@ISA'; +push @ISA, 'TLSProxy::Message'; sub new { diff --git a/util/dofile.pl b/util/dofile.pl index 76dfe2b607..78b8dfed9d 100644 --- a/util/dofile.pl +++ b/util/dofile.pl @@ -35,7 +35,9 @@ use File::Spec::Functions; use lib catdir(dirname(__FILE__)); use with_fallback qw(Text::Template); -use parent qw/Text::Template/; +#use parent qw/Text::Template/; +use vars qw/@ISA/; +push @ISA, qw/Text::Template/; # Override constructor sub new { -- 2.25.1