Module: kamailio Branch: master Commit: 4acaf2f67907b852ac32154932083d05c3ddb112 URL: https://github.com/kamailio/kamailio/commit/4acaf2f67907b852ac32154932083d05...
Author: Victor Seva linuxmaniac@torreviejawireless.org Committer: Victor Seva linuxmaniac@torreviejawireless.org Date: 2016-04-15T09:25:28+02:00
Merge pull request #568 from linuxmaniac/vseva/fix_516
app_perl: Fix "use UNIVERSAL" is a fatal error since perl 5.22
---
Modified: modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm Modified: modules/app_perl/lib/perl/Kamailio/VDB.pm
---
Diff: https://github.com/kamailio/kamailio/commit/4acaf2f67907b852ac32154932083d05... Patch: https://github.com/kamailio/kamailio/commit/4acaf2f67907b852ac32154932083d05...
---
diff --git a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm index f97a22d..3b6509a 100644 --- a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm +++ b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm @@ -52,7 +52,6 @@ package Kamailio::LDAPUtils::LDAPConnection; use Kamailio::LDAPUtils::LDAPConf; use Net::LDAP; use Authen::SASL; -use UNIVERSAL qw( isa );
my $ldap_singleton = undef;
@@ -185,7 +184,7 @@ sub search {
my $ldap = undef;
- if( isa($conf ,"Kamailio::LDAPUtils::LDAPConnection") ) { + if( $conf->isa("Kamailio::LDAPUtils::LDAPConnection") ) { $ldap = $conf; } else { if( ! $ldap_singleton ) { diff --git a/modules/app_perl/lib/perl/Kamailio/VDB.pm b/modules/app_perl/lib/perl/Kamailio/VDB.pm index 8c6bdb3..0fff716 100644 --- a/modules/app_perl/lib/perl/Kamailio/VDB.pm +++ b/modules/app_perl/lib/perl/Kamailio/VDB.pm @@ -45,7 +45,6 @@ use Kamailio::VDB::Result; use Kamailio::VDB::Value; use Kamailio::VDB::VTab;
-use UNIVERSAL qw ( can );
our @ISA = qw ( Kamailio::Utils::Debug );
@@ -87,12 +86,12 @@ sub use_table {
Kamailio::log(L_DBG, "perlvdb:VDB: Setting VTab: v is $v (pkg is $pkg, func/method is $3)\n");
- if (can($pkg, $3)) { + if ($pkg->can($3)) { $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( func => $pkg . "::" . $3); - } elsif (can($v, "init")) { + } elsif ($v->can("init")) { $v->init(); $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $v ); - } elsif (can($v, "new")) { + } elsif ($v->can("new")) { my $obj = $v->new(); $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $obj ); } else {
-
Victor Seva