From d378bbcf1485b12a57d327a5a7fcda3a37b81e10 Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Wed, 23 Aug 2023 12:02:39 -0400 Subject: increment $VERSION after 5.21 release --- Changes | 2 ++ lib/URI.pm | 2 +- lib/URI/Escape.pm | 2 +- lib/URI/Heuristic.pm | 2 +- lib/URI/IRI.pm | 2 +- lib/URI/QueryParam.pm | 2 +- lib/URI/Split.pm | 2 +- lib/URI/URL.pm | 2 +- lib/URI/WithBase.pm | 2 +- lib/URI/_foreign.pm | 2 +- lib/URI/_generic.pm | 2 +- lib/URI/_idna.pm | 2 +- lib/URI/_ldap.pm | 2 +- lib/URI/_login.pm | 2 +- lib/URI/_punycode.pm | 2 +- lib/URI/_query.pm | 2 +- lib/URI/_segment.pm | 2 +- lib/URI/_server.pm | 2 +- lib/URI/_userpass.pm | 2 +- lib/URI/data.pm | 2 +- lib/URI/file.pm | 2 +- lib/URI/file/Base.pm | 2 +- lib/URI/file/FAT.pm | 2 +- lib/URI/file/Mac.pm | 2 +- lib/URI/file/OS2.pm | 2 +- lib/URI/file/QNX.pm | 2 +- lib/URI/file/Unix.pm | 2 +- lib/URI/file/Win32.pm | 2 +- lib/URI/ftp.pm | 2 +- lib/URI/gopher.pm | 2 +- lib/URI/http.pm | 2 +- lib/URI/https.pm | 2 +- lib/URI/icap.pm | 2 +- lib/URI/icaps.pm | 2 +- lib/URI/ldap.pm | 2 +- lib/URI/ldapi.pm | 2 +- lib/URI/ldaps.pm | 2 +- lib/URI/mailto.pm | 2 +- lib/URI/mms.pm | 2 +- lib/URI/news.pm | 2 +- lib/URI/nntp.pm | 2 +- lib/URI/nntps.pm | 2 +- lib/URI/pop.pm | 2 +- lib/URI/rlogin.pm | 2 +- lib/URI/rsync.pm | 2 +- lib/URI/rtsp.pm | 2 +- lib/URI/rtspu.pm | 2 +- lib/URI/sftp.pm | 2 +- lib/URI/sip.pm | 2 +- lib/URI/sips.pm | 2 +- lib/URI/snews.pm | 2 +- lib/URI/ssh.pm | 2 +- lib/URI/telnet.pm | 2 +- lib/URI/tn3270.pm | 2 +- lib/URI/urn.pm | 2 +- lib/URI/urn/isbn.pm | 2 +- lib/URI/urn/oid.pm | 2 +- 57 files changed, 58 insertions(+), 56 deletions(-) diff --git a/Changes b/Changes index 536a0ce..5deb4a0 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,7 @@ Revision history for URI +{{$NEXT}} + 5.21 2023-08-23 16:02:14Z - Fix version declarations in icap.pm and icaps.pm (GH#131) (Olaf Alders) diff --git a/lib/URI.pm b/lib/URI.pm index 5443e11..6472645 100644 --- a/lib/URI.pm +++ b/lib/URI.pm @@ -3,7 +3,7 @@ package URI; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; # 1=version 5.10 and earlier; 0=version 5.11 and later use constant HAS_RESERVED_SQUARE_BRACKETS => $ENV{URI_HAS_RESERVED_SQUARE_BRACKETS} ? 1 : 0; diff --git a/lib/URI/Escape.pm b/lib/URI/Escape.pm index 680807f..322e3f0 100644 --- a/lib/URI/Escape.pm +++ b/lib/URI/Escape.pm @@ -148,7 +148,7 @@ use Exporter 5.57 'import'; our %escapes; our @EXPORT = qw(uri_escape uri_unescape uri_escape_utf8); our @EXPORT_OK = qw(%escapes); -our $VERSION = '5.21'; +our $VERSION = '5.22'; use Carp (); diff --git a/lib/URI/Heuristic.pm b/lib/URI/Heuristic.pm index 6e03602..b8fcf28 100644 --- a/lib/URI/Heuristic.pm +++ b/lib/URI/Heuristic.pm @@ -91,7 +91,7 @@ use warnings; use Exporter 5.57 'import'; our @EXPORT_OK = qw(uf_uri uf_uristr uf_url uf_urlstr); -our $VERSION = '5.21'; +our $VERSION = '5.22'; our ($MY_COUNTRY, $DEBUG); diff --git a/lib/URI/IRI.pm b/lib/URI/IRI.pm index 9795495..d85ce23 100644 --- a/lib/URI/IRI.pm +++ b/lib/URI/IRI.pm @@ -8,7 +8,7 @@ use URI (); use overload '""' => sub { shift->as_string }; -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub new { my($class, $uri, $scheme) = @_; diff --git a/lib/URI/QueryParam.pm b/lib/URI/QueryParam.pm index 59efcfc..45b3b3c 100644 --- a/lib/URI/QueryParam.pm +++ b/lib/URI/QueryParam.pm @@ -2,7 +2,7 @@ package URI::QueryParam; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; 1; diff --git a/lib/URI/Split.pm b/lib/URI/Split.pm index 4499879..c9c93d2 100644 --- a/lib/URI/Split.pm +++ b/lib/URI/Split.pm @@ -3,7 +3,7 @@ package URI::Split; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use Exporter 5.57 'import'; our @EXPORT_OK = qw(uri_split uri_join); diff --git a/lib/URI/URL.pm b/lib/URI/URL.pm index 105d98a..11ac325 100644 --- a/lib/URI/URL.pm +++ b/lib/URI/URL.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::WithBase'; -our $VERSION = '5.21'; +our $VERSION = '5.22'; # Provide as much as possible of the old URI::URL interface for backwards # compatibility... diff --git a/lib/URI/WithBase.pm b/lib/URI/WithBase.pm index 54fe917..83f9065 100644 --- a/lib/URI/WithBase.pm +++ b/lib/URI/WithBase.pm @@ -6,7 +6,7 @@ use warnings; use URI (); use Scalar::Util qw(blessed); -our $VERSION = '5.21'; +our $VERSION = '5.22'; use overload '""' => "as_string", fallback => 1; diff --git a/lib/URI/_foreign.pm b/lib/URI/_foreign.pm index d9da38f..9220797 100644 --- a/lib/URI/_foreign.pm +++ b/lib/URI/_foreign.pm @@ -5,6 +5,6 @@ use warnings; use parent 'URI::_generic'; -our $VERSION = '5.21'; +our $VERSION = '5.22'; 1; diff --git a/lib/URI/_generic.pm b/lib/URI/_generic.pm index 90cb2d2..a54a51d 100644 --- a/lib/URI/_generic.pm +++ b/lib/URI/_generic.pm @@ -8,7 +8,7 @@ use parent qw(URI URI::_query); use URI::Escape qw(uri_unescape); use Carp (); -our $VERSION = '5.21'; +our $VERSION = '5.22'; my $ACHAR = URI::HAS_RESERVED_SQUARE_BRACKETS ? $URI::uric : $URI::uric4host; $ACHAR =~ s,\\[/?],,g; my $PCHAR = $URI::uric; $PCHAR =~ s,\\[?],,g; diff --git a/lib/URI/_idna.pm b/lib/URI/_idna.pm index 5d4a016..fad9ba0 100644 --- a/lib/URI/_idna.pm +++ b/lib/URI/_idna.pm @@ -9,7 +9,7 @@ use warnings; use URI::_punycode qw(decode_punycode encode_punycode); use Carp qw(croak); -our $VERSION = '5.21'; +our $VERSION = '5.22'; BEGIN { *URI::_idna::_ENV_::JOIN_LEAKS_UTF8_FLAGS = "$]" < 5.008_003 diff --git a/lib/URI/_ldap.pm b/lib/URI/_ldap.pm index c9ea497..e1dd5fd 100644 --- a/lib/URI/_ldap.pm +++ b/lib/URI/_ldap.pm @@ -7,7 +7,7 @@ package URI::_ldap; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use URI::Escape qw(uri_unescape); diff --git a/lib/URI/_login.pm b/lib/URI/_login.pm index d8cc0f8..ffeb4be 100644 --- a/lib/URI/_login.pm +++ b/lib/URI/_login.pm @@ -5,7 +5,7 @@ use warnings; use parent qw(URI::_server URI::_userpass); -our $VERSION = '5.21'; +our $VERSION = '5.22'; # Generic terminal logins. This is used as a base class for 'telnet', # 'tn3270', and 'rlogin' URL schemes. diff --git a/lib/URI/_punycode.pm b/lib/URI/_punycode.pm index 2d4c61e..ba0654d 100644 --- a/lib/URI/_punycode.pm +++ b/lib/URI/_punycode.pm @@ -3,7 +3,7 @@ package URI::_punycode; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use Exporter 'import'; our @EXPORT = qw(encode_punycode decode_punycode); diff --git a/lib/URI/_query.pm b/lib/URI/_query.pm index 2ae754f..8287614 100644 --- a/lib/URI/_query.pm +++ b/lib/URI/_query.pm @@ -6,7 +6,7 @@ use warnings; use URI (); use URI::Escape qw(uri_unescape); -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub query { diff --git a/lib/URI/_segment.pm b/lib/URI/_segment.pm index cdde25d..04c0123 100644 --- a/lib/URI/_segment.pm +++ b/lib/URI/_segment.pm @@ -11,7 +11,7 @@ use URI::Escape qw(uri_unescape); use overload '""' => sub { $_[0]->[0] }, fallback => 1; -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub new { diff --git a/lib/URI/_server.pm b/lib/URI/_server.pm index f334878..8018d7b 100644 --- a/lib/URI/_server.pm +++ b/lib/URI/_server.pm @@ -7,7 +7,7 @@ use parent 'URI::_generic'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub _uric_escape { my($class, $str) = @_; diff --git a/lib/URI/_userpass.pm b/lib/URI/_userpass.pm index d0181ae..9ab4ab5 100644 --- a/lib/URI/_userpass.pm +++ b/lib/URI/_userpass.pm @@ -5,7 +5,7 @@ use warnings; use URI::Escape qw(uri_unescape); -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub user { diff --git a/lib/URI/data.pm b/lib/URI/data.pm index 71789dd..b819f63 100644 --- a/lib/URI/data.pm +++ b/lib/URI/data.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI'; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use MIME::Base64 qw(decode_base64 encode_base64); use URI::Escape qw(uri_unescape); diff --git a/lib/URI/file.pm b/lib/URI/file.pm index 08eacfd..cc1914f 100644 --- a/lib/URI/file.pm +++ b/lib/URI/file.pm @@ -4,7 +4,7 @@ use strict; use warnings; use parent 'URI::_generic'; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use URI::Escape qw(uri_unescape); diff --git a/lib/URI/file/Base.pm b/lib/URI/file/Base.pm index 4c1c016..a34f88b 100644 --- a/lib/URI/file/Base.pm +++ b/lib/URI/file/Base.pm @@ -5,7 +5,7 @@ use warnings; use URI::Escape (); -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub new { diff --git a/lib/URI/file/FAT.pm b/lib/URI/file/FAT.pm index 85864ad..04823be 100644 --- a/lib/URI/file/FAT.pm +++ b/lib/URI/file/FAT.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Win32'; -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub fix_path { diff --git a/lib/URI/file/Mac.pm b/lib/URI/file/Mac.pm index dbd21f6..a934bfd 100644 --- a/lib/URI/file/Mac.pm +++ b/lib/URI/file/Mac.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub _file_extract_path { diff --git a/lib/URI/file/OS2.pm b/lib/URI/file/OS2.pm index 6369b19..f89aa9c 100644 --- a/lib/URI/file/OS2.pm +++ b/lib/URI/file/OS2.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Win32'; -our $VERSION = '5.21'; +our $VERSION = '5.22'; # The Win32 version translates k:/foo to file://k:/foo (?!) # We add an empty host diff --git a/lib/URI/file/QNX.pm b/lib/URI/file/QNX.pm index 9cb7d29..fe2cd2c 100644 --- a/lib/URI/file/QNX.pm +++ b/lib/URI/file/QNX.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Unix'; -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub _file_extract_path { diff --git a/lib/URI/file/Unix.pm b/lib/URI/file/Unix.pm index e17ff99..cc66dcb 100644 --- a/lib/URI/file/Unix.pm +++ b/lib/URI/file/Unix.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub _file_extract_path { diff --git a/lib/URI/file/Win32.pm b/lib/URI/file/Win32.pm index bacdeb5..e658fde 100644 --- a/lib/URI/file/Win32.pm +++ b/lib/URI/file/Win32.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub _file_extract_authority { diff --git a/lib/URI/ftp.pm b/lib/URI/ftp.pm index 549ab41..913591b 100644 --- a/lib/URI/ftp.pm +++ b/lib/URI/ftp.pm @@ -3,7 +3,7 @@ package URI::ftp; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent qw(URI::_server URI::_userpass); diff --git a/lib/URI/gopher.pm b/lib/URI/gopher.pm index 52f571b..457f396 100644 --- a/lib/URI/gopher.pm +++ b/lib/URI/gopher.pm @@ -3,7 +3,7 @@ package URI::gopher; # , Dec 4, 1996 use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::_server'; diff --git a/lib/URI/http.pm b/lib/URI/http.pm index 700f47d..6d66034 100644 --- a/lib/URI/http.pm +++ b/lib/URI/http.pm @@ -3,7 +3,7 @@ package URI::http; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::_server'; diff --git a/lib/URI/https.pm b/lib/URI/https.pm index 1fa75fc..addb9a7 100644 --- a/lib/URI/https.pm +++ b/lib/URI/https.pm @@ -3,7 +3,7 @@ package URI::https; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::http'; diff --git a/lib/URI/icap.pm b/lib/URI/icap.pm index 1a88aae..d050c9f 100644 --- a/lib/URI/icap.pm +++ b/lib/URI/icap.pm @@ -4,7 +4,7 @@ use strict; use warnings; use base qw(URI::http); -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub default_port { return 1344 } diff --git a/lib/URI/icaps.pm b/lib/URI/icaps.pm index b281afc..c109e7c 100644 --- a/lib/URI/icaps.pm +++ b/lib/URI/icaps.pm @@ -4,7 +4,7 @@ use strict; use warnings; use base qw(URI::icap); -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub secure { return 1 } diff --git a/lib/URI/ldap.pm b/lib/URI/ldap.pm index da359ed..b7918c9 100644 --- a/lib/URI/ldap.pm +++ b/lib/URI/ldap.pm @@ -7,7 +7,7 @@ package URI::ldap; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent qw(URI::_ldap URI::_server); diff --git a/lib/URI/ldapi.pm b/lib/URI/ldapi.pm index 02cf775..dec58c1 100644 --- a/lib/URI/ldapi.pm +++ b/lib/URI/ldapi.pm @@ -3,7 +3,7 @@ package URI::ldapi; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent qw(URI::_ldap URI::_generic); diff --git a/lib/URI/ldaps.pm b/lib/URI/ldaps.pm index b06d64f..34ae43a 100644 --- a/lib/URI/ldaps.pm +++ b/lib/URI/ldaps.pm @@ -3,7 +3,7 @@ package URI::ldaps; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::ldap'; diff --git a/lib/URI/mailto.pm b/lib/URI/mailto.pm index 9d8ba88..a0f13c1 100644 --- a/lib/URI/mailto.pm +++ b/lib/URI/mailto.pm @@ -3,7 +3,7 @@ package URI::mailto; # RFC 2368 use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent qw(URI URI::_query); diff --git a/lib/URI/mms.pm b/lib/URI/mms.pm index d116d1e..4247867 100644 --- a/lib/URI/mms.pm +++ b/lib/URI/mms.pm @@ -3,7 +3,7 @@ package URI::mms; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::http'; diff --git a/lib/URI/news.pm b/lib/URI/news.pm index be35584..8fb43fe 100644 --- a/lib/URI/news.pm +++ b/lib/URI/news.pm @@ -3,7 +3,7 @@ package URI::news; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::_server'; diff --git a/lib/URI/nntp.pm b/lib/URI/nntp.pm index d947c81..b3c0eac 100644 --- a/lib/URI/nntp.pm +++ b/lib/URI/nntp.pm @@ -3,7 +3,7 @@ package URI::nntp; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::news'; diff --git a/lib/URI/nntps.pm b/lib/URI/nntps.pm index 9e0f8db..81fa8c6 100644 --- a/lib/URI/nntps.pm +++ b/lib/URI/nntps.pm @@ -3,7 +3,7 @@ package URI::nntps; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::nntp'; diff --git a/lib/URI/pop.pm b/lib/URI/pop.pm index 0344105..18693e6 100644 --- a/lib/URI/pop.pm +++ b/lib/URI/pop.pm @@ -3,7 +3,7 @@ package URI::pop; # RFC 2384 use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::_server'; diff --git a/lib/URI/rlogin.pm b/lib/URI/rlogin.pm index 11087e0..047612e 100644 --- a/lib/URI/rlogin.pm +++ b/lib/URI/rlogin.pm @@ -3,7 +3,7 @@ package URI::rlogin; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::_login'; diff --git a/lib/URI/rsync.pm b/lib/URI/rsync.pm index 047f887..8648ef6 100644 --- a/lib/URI/rsync.pm +++ b/lib/URI/rsync.pm @@ -5,7 +5,7 @@ package URI::rsync; # http://rsync.samba.org/ use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent qw(URI::_server URI::_userpass); diff --git a/lib/URI/rtsp.pm b/lib/URI/rtsp.pm index 54b12c4..839f2b1 100644 --- a/lib/URI/rtsp.pm +++ b/lib/URI/rtsp.pm @@ -3,7 +3,7 @@ package URI::rtsp; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::http'; diff --git a/lib/URI/rtspu.pm b/lib/URI/rtspu.pm index c1d89b1..2e3c664 100644 --- a/lib/URI/rtspu.pm +++ b/lib/URI/rtspu.pm @@ -3,7 +3,7 @@ package URI::rtspu; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::rtsp'; diff --git a/lib/URI/sftp.pm b/lib/URI/sftp.pm index 9145fb2..ffe338b 100644 --- a/lib/URI/sftp.pm +++ b/lib/URI/sftp.pm @@ -5,6 +5,6 @@ use warnings; use parent 'URI::ssh'; -our $VERSION = '5.21'; +our $VERSION = '5.22'; 1; diff --git a/lib/URI/sip.pm b/lib/URI/sip.pm index f895987..4fd13d6 100644 --- a/lib/URI/sip.pm +++ b/lib/URI/sip.pm @@ -14,7 +14,7 @@ use parent qw(URI::_server URI::_userpass); use URI::Escape (); -our $VERSION = '5.21'; +our $VERSION = '5.22'; sub default_port { 5060 } diff --git a/lib/URI/sips.pm b/lib/URI/sips.pm index 9cf041e..3a147a9 100644 --- a/lib/URI/sips.pm +++ b/lib/URI/sips.pm @@ -3,7 +3,7 @@ package URI::sips; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::sip'; diff --git a/lib/URI/snews.pm b/lib/URI/snews.pm index ac116fe..daef8ef 100644 --- a/lib/URI/snews.pm +++ b/lib/URI/snews.pm @@ -3,7 +3,7 @@ package URI::snews; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::news'; diff --git a/lib/URI/ssh.pm b/lib/URI/ssh.pm index 09786ff..0f7230e 100644 --- a/lib/URI/ssh.pm +++ b/lib/URI/ssh.pm @@ -3,7 +3,7 @@ package URI::ssh; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::_login'; diff --git a/lib/URI/telnet.pm b/lib/URI/telnet.pm index cf7e124..9f1c40f 100644 --- a/lib/URI/telnet.pm +++ b/lib/URI/telnet.pm @@ -3,7 +3,7 @@ package URI::telnet; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::_login'; diff --git a/lib/URI/tn3270.pm b/lib/URI/tn3270.pm index f22a002..2bc4345 100644 --- a/lib/URI/tn3270.pm +++ b/lib/URI/tn3270.pm @@ -3,7 +3,7 @@ package URI::tn3270; use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::_login'; diff --git a/lib/URI/urn.pm b/lib/URI/urn.pm index b25250f..83f07e0 100644 --- a/lib/URI/urn.pm +++ b/lib/URI/urn.pm @@ -3,7 +3,7 @@ package URI::urn; # RFC 2141 use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI'; diff --git a/lib/URI/urn/isbn.pm b/lib/URI/urn/isbn.pm index a32d0fc..e377023 100644 --- a/lib/URI/urn/isbn.pm +++ b/lib/URI/urn/isbn.pm @@ -3,7 +3,7 @@ package URI::urn::isbn; # RFC 3187 use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::urn'; diff --git a/lib/URI/urn/oid.pm b/lib/URI/urn/oid.pm index b359b5f..424339c 100644 --- a/lib/URI/urn/oid.pm +++ b/lib/URI/urn/oid.pm @@ -3,7 +3,7 @@ package URI::urn::oid; # RFC 2061 use strict; use warnings; -our $VERSION = '5.21'; +our $VERSION = '5.22'; use parent 'URI::urn'; -- cgit v1.2.3 From 1d5be19f48154101c671ec9fc40fdf483a55bdcd Mon Sep 17 00:00:00 2001 From: Jacques Deguest Date: Thu, 7 Sep 2023 21:49:41 +0900 Subject: use Scalar::Util::reftype instead of ref to check for ARRAY --- lib/URI/_query.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/URI/_query.pm b/lib/URI/_query.pm index 8287614..414e1e3 100644 --- a/lib/URI/_query.pm +++ b/lib/URI/_query.pm @@ -5,6 +5,7 @@ use warnings; use URI (); use URI::Escape qw(uri_unescape); +use Scalar::Util (); our $VERSION = '5.22'; @@ -34,7 +35,7 @@ sub query_form { # Try to set query string my $delim; my $r = $_[0]; - if (ref($r) eq "ARRAY") { + if (Scalar::Util::reftype($r) eq "ARRAY") { $delim = $_[1]; @_ = @$r; } @@ -49,7 +50,7 @@ sub query_form { $key = '' unless defined $key; $key =~ s/([;\/?:@&=+,\$\[\]%])/ URI::Escape::escape_char($1)/eg; $key =~ s/ /+/g; - $vals = [ref($vals) eq "ARRAY" ? @$vals : $vals]; + $vals = [Scalar::Util::reftype($vals) eq "ARRAY" ? @$vals : $vals]; for my $val (@$vals) { if (defined $val) { $val =~ s/([;\/?:@&=+,\$\[\]%])/ URI::Escape::escape_char($1)/eg; @@ -86,7 +87,7 @@ sub query_keywords if (@_) { # Try to set query string my @copy = @_; - @copy = @{$copy[0]} if @copy == 1 && ref($copy[0]) eq "ARRAY"; + @copy = @{$copy[0]} if @copy == 1 && Scalar::Util::reftype($copy[0]) eq "ARRAY"; for (@copy) { s/([;\/?:@&=+,\$\[\]%])/ URI::Escape::escape_char($1)/eg; } $self->query(@copy ? join('+', @copy) : undef); } @@ -114,7 +115,7 @@ sub query_param { if (@_) { my @new = @old; my @new_i = @i; - my @vals = map { ref($_) eq 'ARRAY' ? @$_ : $_ } @_; + my @vals = map { Scalar::Util::reftype($_) eq 'ARRAY' ? @$_ : $_ } @_; while (@new_i > @vals) { splice @new, pop @new_i, 2; @@ -139,7 +140,7 @@ sub query_param { sub query_param_append { my $self = shift; my $key = shift; - my @vals = map { ref $_ eq 'ARRAY' ? @$_ : $_ } @_; + my @vals = map { Scalar::Util::reftype $_ eq 'ARRAY' ? @$_ : $_ } @_; $self->query_form($self->query_form, $key => \@vals); # XXX return; } @@ -168,7 +169,7 @@ sub query_form_hash { while (my($k, $v) = splice(@old, 0, 2)) { if (exists $hash{$k}) { for ($hash{$k}) { - $_ = [$_] unless ref($_) eq "ARRAY"; + $_ = [$_] unless Scalar::Util::reftype($_) eq "ARRAY"; push(@$_, $v); } } -- cgit v1.2.3 From 08b00a02ca6380c5cc3d7c19083e719cb9d8ed0f Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Thu, 25 Jan 2024 10:00:20 -0500 Subject: Update Changes --- Changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changes b/Changes index 5deb4a0..f14d2b9 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for URI {{$NEXT}} + - Use Scalar::Util::reftype instead of ref to check for ARRAY (GH#132) + (Jacques Deguest) 5.21 2023-08-23 16:02:14Z - Fix version declarations in icap.pm and icaps.pm (GH#131) (Olaf Alders) -- cgit v1.2.3 From fc3628dc281304cb843a2c00799a7a8682fd1d51 Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Thu, 25 Jan 2024 15:24:05 +0000 Subject: URI-5.22 - Use Scalar::Util::reftype instead of ref to check for ARRAY (GH#132) (Jacques Deguest) --- Changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changes b/Changes index f14d2b9..f0198f0 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,6 @@ Revision history for URI -{{$NEXT}} +5.22 2024-01-25 15:22:54Z - Use Scalar::Util::reftype instead of ref to check for ARRAY (GH#132) (Jacques Deguest) -- cgit v1.2.3 From 14c657d8e9381e7ebb733580128ecdc53a41e0b7 Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Thu, 25 Jan 2024 15:24:05 +0000 Subject: increment $VERSION after 5.22 release --- Changes | 2 ++ lib/URI.pm | 2 +- lib/URI/Escape.pm | 2 +- lib/URI/Heuristic.pm | 2 +- lib/URI/IRI.pm | 2 +- lib/URI/QueryParam.pm | 2 +- lib/URI/Split.pm | 2 +- lib/URI/URL.pm | 2 +- lib/URI/WithBase.pm | 2 +- lib/URI/_foreign.pm | 2 +- lib/URI/_generic.pm | 2 +- lib/URI/_idna.pm | 2 +- lib/URI/_ldap.pm | 2 +- lib/URI/_login.pm | 2 +- lib/URI/_punycode.pm | 2 +- lib/URI/_query.pm | 2 +- lib/URI/_segment.pm | 2 +- lib/URI/_server.pm | 2 +- lib/URI/_userpass.pm | 2 +- lib/URI/data.pm | 2 +- lib/URI/file.pm | 2 +- lib/URI/file/Base.pm | 2 +- lib/URI/file/FAT.pm | 2 +- lib/URI/file/Mac.pm | 2 +- lib/URI/file/OS2.pm | 2 +- lib/URI/file/QNX.pm | 2 +- lib/URI/file/Unix.pm | 2 +- lib/URI/file/Win32.pm | 2 +- lib/URI/ftp.pm | 2 +- lib/URI/gopher.pm | 2 +- lib/URI/http.pm | 2 +- lib/URI/https.pm | 2 +- lib/URI/icap.pm | 2 +- lib/URI/icaps.pm | 2 +- lib/URI/ldap.pm | 2 +- lib/URI/ldapi.pm | 2 +- lib/URI/ldaps.pm | 2 +- lib/URI/mailto.pm | 2 +- lib/URI/mms.pm | 2 +- lib/URI/news.pm | 2 +- lib/URI/nntp.pm | 2 +- lib/URI/nntps.pm | 2 +- lib/URI/pop.pm | 2 +- lib/URI/rlogin.pm | 2 +- lib/URI/rsync.pm | 2 +- lib/URI/rtsp.pm | 2 +- lib/URI/rtspu.pm | 2 +- lib/URI/sftp.pm | 2 +- lib/URI/sip.pm | 2 +- lib/URI/sips.pm | 2 +- lib/URI/snews.pm | 2 +- lib/URI/ssh.pm | 2 +- lib/URI/telnet.pm | 2 +- lib/URI/tn3270.pm | 2 +- lib/URI/urn.pm | 2 +- lib/URI/urn/isbn.pm | 2 +- lib/URI/urn/oid.pm | 2 +- 57 files changed, 58 insertions(+), 56 deletions(-) diff --git a/Changes b/Changes index f0198f0..71c85d9 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,7 @@ Revision history for URI +{{$NEXT}} + 5.22 2024-01-25 15:22:54Z - Use Scalar::Util::reftype instead of ref to check for ARRAY (GH#132) (Jacques Deguest) diff --git a/lib/URI.pm b/lib/URI.pm index 6472645..4808b72 100644 --- a/lib/URI.pm +++ b/lib/URI.pm @@ -3,7 +3,7 @@ package URI; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; # 1=version 5.10 and earlier; 0=version 5.11 and later use constant HAS_RESERVED_SQUARE_BRACKETS => $ENV{URI_HAS_RESERVED_SQUARE_BRACKETS} ? 1 : 0; diff --git a/lib/URI/Escape.pm b/lib/URI/Escape.pm index 322e3f0..818e4a6 100644 --- a/lib/URI/Escape.pm +++ b/lib/URI/Escape.pm @@ -148,7 +148,7 @@ use Exporter 5.57 'import'; our %escapes; our @EXPORT = qw(uri_escape uri_unescape uri_escape_utf8); our @EXPORT_OK = qw(%escapes); -our $VERSION = '5.22'; +our $VERSION = '5.23'; use Carp (); diff --git a/lib/URI/Heuristic.pm b/lib/URI/Heuristic.pm index b8fcf28..96dd6bb 100644 --- a/lib/URI/Heuristic.pm +++ b/lib/URI/Heuristic.pm @@ -91,7 +91,7 @@ use warnings; use Exporter 5.57 'import'; our @EXPORT_OK = qw(uf_uri uf_uristr uf_url uf_urlstr); -our $VERSION = '5.22'; +our $VERSION = '5.23'; our ($MY_COUNTRY, $DEBUG); diff --git a/lib/URI/IRI.pm b/lib/URI/IRI.pm index d85ce23..0ccc555 100644 --- a/lib/URI/IRI.pm +++ b/lib/URI/IRI.pm @@ -8,7 +8,7 @@ use URI (); use overload '""' => sub { shift->as_string }; -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub new { my($class, $uri, $scheme) = @_; diff --git a/lib/URI/QueryParam.pm b/lib/URI/QueryParam.pm index 45b3b3c..cfdd104 100644 --- a/lib/URI/QueryParam.pm +++ b/lib/URI/QueryParam.pm @@ -2,7 +2,7 @@ package URI::QueryParam; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; 1; diff --git a/lib/URI/Split.pm b/lib/URI/Split.pm index c9c93d2..54a1e8e 100644 --- a/lib/URI/Split.pm +++ b/lib/URI/Split.pm @@ -3,7 +3,7 @@ package URI::Split; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use Exporter 5.57 'import'; our @EXPORT_OK = qw(uri_split uri_join); diff --git a/lib/URI/URL.pm b/lib/URI/URL.pm index 11ac325..5b139ce 100644 --- a/lib/URI/URL.pm +++ b/lib/URI/URL.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::WithBase'; -our $VERSION = '5.22'; +our $VERSION = '5.23'; # Provide as much as possible of the old URI::URL interface for backwards # compatibility... diff --git a/lib/URI/WithBase.pm b/lib/URI/WithBase.pm index 83f9065..ab42e43 100644 --- a/lib/URI/WithBase.pm +++ b/lib/URI/WithBase.pm @@ -6,7 +6,7 @@ use warnings; use URI (); use Scalar::Util qw(blessed); -our $VERSION = '5.22'; +our $VERSION = '5.23'; use overload '""' => "as_string", fallback => 1; diff --git a/lib/URI/_foreign.pm b/lib/URI/_foreign.pm index 9220797..3a2b04a 100644 --- a/lib/URI/_foreign.pm +++ b/lib/URI/_foreign.pm @@ -5,6 +5,6 @@ use warnings; use parent 'URI::_generic'; -our $VERSION = '5.22'; +our $VERSION = '5.23'; 1; diff --git a/lib/URI/_generic.pm b/lib/URI/_generic.pm index a54a51d..7c2a375 100644 --- a/lib/URI/_generic.pm +++ b/lib/URI/_generic.pm @@ -8,7 +8,7 @@ use parent qw(URI URI::_query); use URI::Escape qw(uri_unescape); use Carp (); -our $VERSION = '5.22'; +our $VERSION = '5.23'; my $ACHAR = URI::HAS_RESERVED_SQUARE_BRACKETS ? $URI::uric : $URI::uric4host; $ACHAR =~ s,\\[/?],,g; my $PCHAR = $URI::uric; $PCHAR =~ s,\\[?],,g; diff --git a/lib/URI/_idna.pm b/lib/URI/_idna.pm index fad9ba0..b919070 100644 --- a/lib/URI/_idna.pm +++ b/lib/URI/_idna.pm @@ -9,7 +9,7 @@ use warnings; use URI::_punycode qw(decode_punycode encode_punycode); use Carp qw(croak); -our $VERSION = '5.22'; +our $VERSION = '5.23'; BEGIN { *URI::_idna::_ENV_::JOIN_LEAKS_UTF8_FLAGS = "$]" < 5.008_003 diff --git a/lib/URI/_ldap.pm b/lib/URI/_ldap.pm index e1dd5fd..e553fbf 100644 --- a/lib/URI/_ldap.pm +++ b/lib/URI/_ldap.pm @@ -7,7 +7,7 @@ package URI::_ldap; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use URI::Escape qw(uri_unescape); diff --git a/lib/URI/_login.pm b/lib/URI/_login.pm index ffeb4be..0d482dc 100644 --- a/lib/URI/_login.pm +++ b/lib/URI/_login.pm @@ -5,7 +5,7 @@ use warnings; use parent qw(URI::_server URI::_userpass); -our $VERSION = '5.22'; +our $VERSION = '5.23'; # Generic terminal logins. This is used as a base class for 'telnet', # 'tn3270', and 'rlogin' URL schemes. diff --git a/lib/URI/_punycode.pm b/lib/URI/_punycode.pm index ba0654d..a62d5e9 100644 --- a/lib/URI/_punycode.pm +++ b/lib/URI/_punycode.pm @@ -3,7 +3,7 @@ package URI::_punycode; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use Exporter 'import'; our @EXPORT = qw(encode_punycode decode_punycode); diff --git a/lib/URI/_query.pm b/lib/URI/_query.pm index 414e1e3..68ba5ce 100644 --- a/lib/URI/_query.pm +++ b/lib/URI/_query.pm @@ -7,7 +7,7 @@ use URI (); use URI::Escape qw(uri_unescape); use Scalar::Util (); -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub query { diff --git a/lib/URI/_segment.pm b/lib/URI/_segment.pm index 04c0123..266fb5d 100644 --- a/lib/URI/_segment.pm +++ b/lib/URI/_segment.pm @@ -11,7 +11,7 @@ use URI::Escape qw(uri_unescape); use overload '""' => sub { $_[0]->[0] }, fallback => 1; -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub new { diff --git a/lib/URI/_server.pm b/lib/URI/_server.pm index 8018d7b..e63f0c7 100644 --- a/lib/URI/_server.pm +++ b/lib/URI/_server.pm @@ -7,7 +7,7 @@ use parent 'URI::_generic'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub _uric_escape { my($class, $str) = @_; diff --git a/lib/URI/_userpass.pm b/lib/URI/_userpass.pm index 9ab4ab5..a337378 100644 --- a/lib/URI/_userpass.pm +++ b/lib/URI/_userpass.pm @@ -5,7 +5,7 @@ use warnings; use URI::Escape qw(uri_unescape); -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub user { diff --git a/lib/URI/data.pm b/lib/URI/data.pm index b819f63..63573bc 100644 --- a/lib/URI/data.pm +++ b/lib/URI/data.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI'; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use MIME::Base64 qw(decode_base64 encode_base64); use URI::Escape qw(uri_unescape); diff --git a/lib/URI/file.pm b/lib/URI/file.pm index cc1914f..94502f1 100644 --- a/lib/URI/file.pm +++ b/lib/URI/file.pm @@ -4,7 +4,7 @@ use strict; use warnings; use parent 'URI::_generic'; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use URI::Escape qw(uri_unescape); diff --git a/lib/URI/file/Base.pm b/lib/URI/file/Base.pm index a34f88b..bcfa5a0 100644 --- a/lib/URI/file/Base.pm +++ b/lib/URI/file/Base.pm @@ -5,7 +5,7 @@ use warnings; use URI::Escape (); -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub new { diff --git a/lib/URI/file/FAT.pm b/lib/URI/file/FAT.pm index 04823be..ef8d830 100644 --- a/lib/URI/file/FAT.pm +++ b/lib/URI/file/FAT.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Win32'; -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub fix_path { diff --git a/lib/URI/file/Mac.pm b/lib/URI/file/Mac.pm index a934bfd..014cd2c 100644 --- a/lib/URI/file/Mac.pm +++ b/lib/URI/file/Mac.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub _file_extract_path { diff --git a/lib/URI/file/OS2.pm b/lib/URI/file/OS2.pm index f89aa9c..a97dd35 100644 --- a/lib/URI/file/OS2.pm +++ b/lib/URI/file/OS2.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Win32'; -our $VERSION = '5.22'; +our $VERSION = '5.23'; # The Win32 version translates k:/foo to file://k:/foo (?!) # We add an empty host diff --git a/lib/URI/file/QNX.pm b/lib/URI/file/QNX.pm index fe2cd2c..fb67dbf 100644 --- a/lib/URI/file/QNX.pm +++ b/lib/URI/file/QNX.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Unix'; -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub _file_extract_path { diff --git a/lib/URI/file/Unix.pm b/lib/URI/file/Unix.pm index cc66dcb..14dba86 100644 --- a/lib/URI/file/Unix.pm +++ b/lib/URI/file/Unix.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub _file_extract_path { diff --git a/lib/URI/file/Win32.pm b/lib/URI/file/Win32.pm index e658fde..72b2128 100644 --- a/lib/URI/file/Win32.pm +++ b/lib/URI/file/Win32.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub _file_extract_authority { diff --git a/lib/URI/ftp.pm b/lib/URI/ftp.pm index 913591b..0b6be32 100644 --- a/lib/URI/ftp.pm +++ b/lib/URI/ftp.pm @@ -3,7 +3,7 @@ package URI::ftp; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent qw(URI::_server URI::_userpass); diff --git a/lib/URI/gopher.pm b/lib/URI/gopher.pm index 457f396..b35925d 100644 --- a/lib/URI/gopher.pm +++ b/lib/URI/gopher.pm @@ -3,7 +3,7 @@ package URI::gopher; # , Dec 4, 1996 use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::_server'; diff --git a/lib/URI/http.pm b/lib/URI/http.pm index 6d66034..b439ad2 100644 --- a/lib/URI/http.pm +++ b/lib/URI/http.pm @@ -3,7 +3,7 @@ package URI::http; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::_server'; diff --git a/lib/URI/https.pm b/lib/URI/https.pm index addb9a7..d213d4c 100644 --- a/lib/URI/https.pm +++ b/lib/URI/https.pm @@ -3,7 +3,7 @@ package URI::https; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::http'; diff --git a/lib/URI/icap.pm b/lib/URI/icap.pm index d050c9f..9ba2ca7 100644 --- a/lib/URI/icap.pm +++ b/lib/URI/icap.pm @@ -4,7 +4,7 @@ use strict; use warnings; use base qw(URI::http); -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub default_port { return 1344 } diff --git a/lib/URI/icaps.pm b/lib/URI/icaps.pm index c109e7c..22dd612 100644 --- a/lib/URI/icaps.pm +++ b/lib/URI/icaps.pm @@ -4,7 +4,7 @@ use strict; use warnings; use base qw(URI::icap); -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub secure { return 1 } diff --git a/lib/URI/ldap.pm b/lib/URI/ldap.pm index b7918c9..9485b00 100644 --- a/lib/URI/ldap.pm +++ b/lib/URI/ldap.pm @@ -7,7 +7,7 @@ package URI::ldap; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent qw(URI::_ldap URI::_server); diff --git a/lib/URI/ldapi.pm b/lib/URI/ldapi.pm index dec58c1..ff2e9de 100644 --- a/lib/URI/ldapi.pm +++ b/lib/URI/ldapi.pm @@ -3,7 +3,7 @@ package URI::ldapi; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent qw(URI::_ldap URI::_generic); diff --git a/lib/URI/ldaps.pm b/lib/URI/ldaps.pm index 34ae43a..79dd402 100644 --- a/lib/URI/ldaps.pm +++ b/lib/URI/ldaps.pm @@ -3,7 +3,7 @@ package URI::ldaps; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::ldap'; diff --git a/lib/URI/mailto.pm b/lib/URI/mailto.pm index a0f13c1..0554d15 100644 --- a/lib/URI/mailto.pm +++ b/lib/URI/mailto.pm @@ -3,7 +3,7 @@ package URI::mailto; # RFC 2368 use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent qw(URI URI::_query); diff --git a/lib/URI/mms.pm b/lib/URI/mms.pm index 4247867..7ebc298 100644 --- a/lib/URI/mms.pm +++ b/lib/URI/mms.pm @@ -3,7 +3,7 @@ package URI::mms; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::http'; diff --git a/lib/URI/news.pm b/lib/URI/news.pm index 8fb43fe..e94c6b6 100644 --- a/lib/URI/news.pm +++ b/lib/URI/news.pm @@ -3,7 +3,7 @@ package URI::news; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::_server'; diff --git a/lib/URI/nntp.pm b/lib/URI/nntp.pm index b3c0eac..80d84ed 100644 --- a/lib/URI/nntp.pm +++ b/lib/URI/nntp.pm @@ -3,7 +3,7 @@ package URI::nntp; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::news'; diff --git a/lib/URI/nntps.pm b/lib/URI/nntps.pm index 81fa8c6..4c76d5e 100644 --- a/lib/URI/nntps.pm +++ b/lib/URI/nntps.pm @@ -3,7 +3,7 @@ package URI::nntps; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::nntp'; diff --git a/lib/URI/pop.pm b/lib/URI/pop.pm index 18693e6..c36cf67 100644 --- a/lib/URI/pop.pm +++ b/lib/URI/pop.pm @@ -3,7 +3,7 @@ package URI::pop; # RFC 2384 use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::_server'; diff --git a/lib/URI/rlogin.pm b/lib/URI/rlogin.pm index 047612e..52589ea 100644 --- a/lib/URI/rlogin.pm +++ b/lib/URI/rlogin.pm @@ -3,7 +3,7 @@ package URI::rlogin; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::_login'; diff --git a/lib/URI/rsync.pm b/lib/URI/rsync.pm index 8648ef6..0ca5257 100644 --- a/lib/URI/rsync.pm +++ b/lib/URI/rsync.pm @@ -5,7 +5,7 @@ package URI::rsync; # http://rsync.samba.org/ use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent qw(URI::_server URI::_userpass); diff --git a/lib/URI/rtsp.pm b/lib/URI/rtsp.pm index 839f2b1..1cd44a8 100644 --- a/lib/URI/rtsp.pm +++ b/lib/URI/rtsp.pm @@ -3,7 +3,7 @@ package URI::rtsp; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::http'; diff --git a/lib/URI/rtspu.pm b/lib/URI/rtspu.pm index 2e3c664..eb0495a 100644 --- a/lib/URI/rtspu.pm +++ b/lib/URI/rtspu.pm @@ -3,7 +3,7 @@ package URI::rtspu; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::rtsp'; diff --git a/lib/URI/sftp.pm b/lib/URI/sftp.pm index ffe338b..209adbc 100644 --- a/lib/URI/sftp.pm +++ b/lib/URI/sftp.pm @@ -5,6 +5,6 @@ use warnings; use parent 'URI::ssh'; -our $VERSION = '5.22'; +our $VERSION = '5.23'; 1; diff --git a/lib/URI/sip.pm b/lib/URI/sip.pm index 4fd13d6..a04aebd 100644 --- a/lib/URI/sip.pm +++ b/lib/URI/sip.pm @@ -14,7 +14,7 @@ use parent qw(URI::_server URI::_userpass); use URI::Escape (); -our $VERSION = '5.22'; +our $VERSION = '5.23'; sub default_port { 5060 } diff --git a/lib/URI/sips.pm b/lib/URI/sips.pm index 3a147a9..29d6cca 100644 --- a/lib/URI/sips.pm +++ b/lib/URI/sips.pm @@ -3,7 +3,7 @@ package URI::sips; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::sip'; diff --git a/lib/URI/snews.pm b/lib/URI/snews.pm index daef8ef..8766793 100644 --- a/lib/URI/snews.pm +++ b/lib/URI/snews.pm @@ -3,7 +3,7 @@ package URI::snews; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::news'; diff --git a/lib/URI/ssh.pm b/lib/URI/ssh.pm index 0f7230e..890da31 100644 --- a/lib/URI/ssh.pm +++ b/lib/URI/ssh.pm @@ -3,7 +3,7 @@ package URI::ssh; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::_login'; diff --git a/lib/URI/telnet.pm b/lib/URI/telnet.pm index 9f1c40f..dd5681c 100644 --- a/lib/URI/telnet.pm +++ b/lib/URI/telnet.pm @@ -3,7 +3,7 @@ package URI::telnet; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::_login'; diff --git a/lib/URI/tn3270.pm b/lib/URI/tn3270.pm index 2bc4345..9e033e2 100644 --- a/lib/URI/tn3270.pm +++ b/lib/URI/tn3270.pm @@ -3,7 +3,7 @@ package URI::tn3270; use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::_login'; diff --git a/lib/URI/urn.pm b/lib/URI/urn.pm index 83f07e0..c06d841 100644 --- a/lib/URI/urn.pm +++ b/lib/URI/urn.pm @@ -3,7 +3,7 @@ package URI::urn; # RFC 2141 use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI'; diff --git a/lib/URI/urn/isbn.pm b/lib/URI/urn/isbn.pm index e377023..0dc6ada 100644 --- a/lib/URI/urn/isbn.pm +++ b/lib/URI/urn/isbn.pm @@ -3,7 +3,7 @@ package URI::urn::isbn; # RFC 3187 use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::urn'; diff --git a/lib/URI/urn/oid.pm b/lib/URI/urn/oid.pm index 424339c..6e4fdf3 100644 --- a/lib/URI/urn/oid.pm +++ b/lib/URI/urn/oid.pm @@ -3,7 +3,7 @@ package URI::urn::oid; # RFC 2061 use strict; use warnings; -our $VERSION = '5.22'; +our $VERSION = '5.23'; use parent 'URI::urn'; -- cgit v1.2.3 From 8f8b549bebc8969053bbe30549a40b71f1dfcf4e Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Thu, 25 Jan 2024 15:39:07 -0500 Subject: Revert "URI-5.22" This reverts commit fc3628dc281304cb843a2c00799a7a8682fd1d51. --- Changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changes b/Changes index 71c85d9..23cac2d 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for URI {{$NEXT}} + - Revert the reftype change introduced in 5.22 as it causes warnings. + (GH#134) (Olaf Alders) 5.22 2024-01-25 15:22:54Z - Use Scalar::Util::reftype instead of ref to check for ARRAY (GH#132) -- cgit v1.2.3 From edddefa77824eb77987f64cb82dda993740c44a4 Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Thu, 25 Jan 2024 21:03:43 +0000 Subject: URI-5.23 - Revert the reftype change introduced in 5.22 as it causes warnings. (GH#134) (Olaf Alders) --- Changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changes b/Changes index 23cac2d..51d3c44 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,6 @@ Revision history for URI -{{$NEXT}} +5.23 2024-01-25 21:02:18Z - Revert the reftype change introduced in 5.22 as it causes warnings. (GH#134) (Olaf Alders) -- cgit v1.2.3 From 4b16737e3f9adc20d8f673ab410da8b48a692e42 Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Thu, 25 Jan 2024 21:03:43 +0000 Subject: increment $VERSION after 5.23 release --- Changes | 2 ++ lib/URI.pm | 2 +- lib/URI/Escape.pm | 2 +- lib/URI/Heuristic.pm | 2 +- lib/URI/IRI.pm | 2 +- lib/URI/QueryParam.pm | 2 +- lib/URI/Split.pm | 2 +- lib/URI/URL.pm | 2 +- lib/URI/WithBase.pm | 2 +- lib/URI/_foreign.pm | 2 +- lib/URI/_generic.pm | 2 +- lib/URI/_idna.pm | 2 +- lib/URI/_ldap.pm | 2 +- lib/URI/_login.pm | 2 +- lib/URI/_punycode.pm | 2 +- lib/URI/_query.pm | 2 +- lib/URI/_segment.pm | 2 +- lib/URI/_server.pm | 2 +- lib/URI/_userpass.pm | 2 +- lib/URI/data.pm | 2 +- lib/URI/file.pm | 2 +- lib/URI/file/Base.pm | 2 +- lib/URI/file/FAT.pm | 2 +- lib/URI/file/Mac.pm | 2 +- lib/URI/file/OS2.pm | 2 +- lib/URI/file/QNX.pm | 2 +- lib/URI/file/Unix.pm | 2 +- lib/URI/file/Win32.pm | 2 +- lib/URI/ftp.pm | 2 +- lib/URI/gopher.pm | 2 +- lib/URI/http.pm | 2 +- lib/URI/https.pm | 2 +- lib/URI/icap.pm | 2 +- lib/URI/icaps.pm | 2 +- lib/URI/ldap.pm | 2 +- lib/URI/ldapi.pm | 2 +- lib/URI/ldaps.pm | 2 +- lib/URI/mailto.pm | 2 +- lib/URI/mms.pm | 2 +- lib/URI/news.pm | 2 +- lib/URI/nntp.pm | 2 +- lib/URI/nntps.pm | 2 +- lib/URI/pop.pm | 2 +- lib/URI/rlogin.pm | 2 +- lib/URI/rsync.pm | 2 +- lib/URI/rtsp.pm | 2 +- lib/URI/rtspu.pm | 2 +- lib/URI/sftp.pm | 2 +- lib/URI/sip.pm | 2 +- lib/URI/sips.pm | 2 +- lib/URI/snews.pm | 2 +- lib/URI/ssh.pm | 2 +- lib/URI/telnet.pm | 2 +- lib/URI/tn3270.pm | 2 +- lib/URI/urn.pm | 2 +- lib/URI/urn/isbn.pm | 2 +- lib/URI/urn/oid.pm | 2 +- 57 files changed, 58 insertions(+), 56 deletions(-) diff --git a/Changes b/Changes index 51d3c44..305de7c 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,7 @@ Revision history for URI +{{$NEXT}} + 5.23 2024-01-25 21:02:18Z - Revert the reftype change introduced in 5.22 as it causes warnings. (GH#134) (Olaf Alders) diff --git a/lib/URI.pm b/lib/URI.pm index 4808b72..58eab43 100644 --- a/lib/URI.pm +++ b/lib/URI.pm @@ -3,7 +3,7 @@ package URI; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; # 1=version 5.10 and earlier; 0=version 5.11 and later use constant HAS_RESERVED_SQUARE_BRACKETS => $ENV{URI_HAS_RESERVED_SQUARE_BRACKETS} ? 1 : 0; diff --git a/lib/URI/Escape.pm b/lib/URI/Escape.pm index 818e4a6..3a25e79 100644 --- a/lib/URI/Escape.pm +++ b/lib/URI/Escape.pm @@ -148,7 +148,7 @@ use Exporter 5.57 'import'; our %escapes; our @EXPORT = qw(uri_escape uri_unescape uri_escape_utf8); our @EXPORT_OK = qw(%escapes); -our $VERSION = '5.23'; +our $VERSION = '5.24'; use Carp (); diff --git a/lib/URI/Heuristic.pm b/lib/URI/Heuristic.pm index 96dd6bb..1605570 100644 --- a/lib/URI/Heuristic.pm +++ b/lib/URI/Heuristic.pm @@ -91,7 +91,7 @@ use warnings; use Exporter 5.57 'import'; our @EXPORT_OK = qw(uf_uri uf_uristr uf_url uf_urlstr); -our $VERSION = '5.23'; +our $VERSION = '5.24'; our ($MY_COUNTRY, $DEBUG); diff --git a/lib/URI/IRI.pm b/lib/URI/IRI.pm index 0ccc555..f576e06 100644 --- a/lib/URI/IRI.pm +++ b/lib/URI/IRI.pm @@ -8,7 +8,7 @@ use URI (); use overload '""' => sub { shift->as_string }; -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub new { my($class, $uri, $scheme) = @_; diff --git a/lib/URI/QueryParam.pm b/lib/URI/QueryParam.pm index cfdd104..0ab9dd9 100644 --- a/lib/URI/QueryParam.pm +++ b/lib/URI/QueryParam.pm @@ -2,7 +2,7 @@ package URI::QueryParam; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; 1; diff --git a/lib/URI/Split.pm b/lib/URI/Split.pm index 54a1e8e..e6763c7 100644 --- a/lib/URI/Split.pm +++ b/lib/URI/Split.pm @@ -3,7 +3,7 @@ package URI::Split; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use Exporter 5.57 'import'; our @EXPORT_OK = qw(uri_split uri_join); diff --git a/lib/URI/URL.pm b/lib/URI/URL.pm index 5b139ce..11fe460 100644 --- a/lib/URI/URL.pm +++ b/lib/URI/URL.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::WithBase'; -our $VERSION = '5.23'; +our $VERSION = '5.24'; # Provide as much as possible of the old URI::URL interface for backwards # compatibility... diff --git a/lib/URI/WithBase.pm b/lib/URI/WithBase.pm index ab42e43..f2a295e 100644 --- a/lib/URI/WithBase.pm +++ b/lib/URI/WithBase.pm @@ -6,7 +6,7 @@ use warnings; use URI (); use Scalar::Util qw(blessed); -our $VERSION = '5.23'; +our $VERSION = '5.24'; use overload '""' => "as_string", fallback => 1; diff --git a/lib/URI/_foreign.pm b/lib/URI/_foreign.pm index 3a2b04a..9ae0511 100644 --- a/lib/URI/_foreign.pm +++ b/lib/URI/_foreign.pm @@ -5,6 +5,6 @@ use warnings; use parent 'URI::_generic'; -our $VERSION = '5.23'; +our $VERSION = '5.24'; 1; diff --git a/lib/URI/_generic.pm b/lib/URI/_generic.pm index 7c2a375..99d0605 100644 --- a/lib/URI/_generic.pm +++ b/lib/URI/_generic.pm @@ -8,7 +8,7 @@ use parent qw(URI URI::_query); use URI::Escape qw(uri_unescape); use Carp (); -our $VERSION = '5.23'; +our $VERSION = '5.24'; my $ACHAR = URI::HAS_RESERVED_SQUARE_BRACKETS ? $URI::uric : $URI::uric4host; $ACHAR =~ s,\\[/?],,g; my $PCHAR = $URI::uric; $PCHAR =~ s,\\[?],,g; diff --git a/lib/URI/_idna.pm b/lib/URI/_idna.pm index b919070..20dcc35 100644 --- a/lib/URI/_idna.pm +++ b/lib/URI/_idna.pm @@ -9,7 +9,7 @@ use warnings; use URI::_punycode qw(decode_punycode encode_punycode); use Carp qw(croak); -our $VERSION = '5.23'; +our $VERSION = '5.24'; BEGIN { *URI::_idna::_ENV_::JOIN_LEAKS_UTF8_FLAGS = "$]" < 5.008_003 diff --git a/lib/URI/_ldap.pm b/lib/URI/_ldap.pm index e553fbf..145deba 100644 --- a/lib/URI/_ldap.pm +++ b/lib/URI/_ldap.pm @@ -7,7 +7,7 @@ package URI::_ldap; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use URI::Escape qw(uri_unescape); diff --git a/lib/URI/_login.pm b/lib/URI/_login.pm index 0d482dc..e78858c 100644 --- a/lib/URI/_login.pm +++ b/lib/URI/_login.pm @@ -5,7 +5,7 @@ use warnings; use parent qw(URI::_server URI::_userpass); -our $VERSION = '5.23'; +our $VERSION = '5.24'; # Generic terminal logins. This is used as a base class for 'telnet', # 'tn3270', and 'rlogin' URL schemes. diff --git a/lib/URI/_punycode.pm b/lib/URI/_punycode.pm index a62d5e9..3cc3155 100644 --- a/lib/URI/_punycode.pm +++ b/lib/URI/_punycode.pm @@ -3,7 +3,7 @@ package URI::_punycode; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use Exporter 'import'; our @EXPORT = qw(encode_punycode decode_punycode); diff --git a/lib/URI/_query.pm b/lib/URI/_query.pm index 68ba5ce..4b24cb6 100644 --- a/lib/URI/_query.pm +++ b/lib/URI/_query.pm @@ -7,7 +7,7 @@ use URI (); use URI::Escape qw(uri_unescape); use Scalar::Util (); -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub query { diff --git a/lib/URI/_segment.pm b/lib/URI/_segment.pm index 266fb5d..8d462c9 100644 --- a/lib/URI/_segment.pm +++ b/lib/URI/_segment.pm @@ -11,7 +11,7 @@ use URI::Escape qw(uri_unescape); use overload '""' => sub { $_[0]->[0] }, fallback => 1; -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub new { diff --git a/lib/URI/_server.pm b/lib/URI/_server.pm index e63f0c7..e4cb442 100644 --- a/lib/URI/_server.pm +++ b/lib/URI/_server.pm @@ -7,7 +7,7 @@ use parent 'URI::_generic'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub _uric_escape { my($class, $str) = @_; diff --git a/lib/URI/_userpass.pm b/lib/URI/_userpass.pm index a337378..e0960a4 100644 --- a/lib/URI/_userpass.pm +++ b/lib/URI/_userpass.pm @@ -5,7 +5,7 @@ use warnings; use URI::Escape qw(uri_unescape); -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub user { diff --git a/lib/URI/data.pm b/lib/URI/data.pm index 63573bc..3287591 100644 --- a/lib/URI/data.pm +++ b/lib/URI/data.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI'; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use MIME::Base64 qw(decode_base64 encode_base64); use URI::Escape qw(uri_unescape); diff --git a/lib/URI/file.pm b/lib/URI/file.pm index 94502f1..23aee67 100644 --- a/lib/URI/file.pm +++ b/lib/URI/file.pm @@ -4,7 +4,7 @@ use strict; use warnings; use parent 'URI::_generic'; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use URI::Escape qw(uri_unescape); diff --git a/lib/URI/file/Base.pm b/lib/URI/file/Base.pm index bcfa5a0..dd9dd26 100644 --- a/lib/URI/file/Base.pm +++ b/lib/URI/file/Base.pm @@ -5,7 +5,7 @@ use warnings; use URI::Escape (); -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub new { diff --git a/lib/URI/file/FAT.pm b/lib/URI/file/FAT.pm index ef8d830..50036dc 100644 --- a/lib/URI/file/FAT.pm +++ b/lib/URI/file/FAT.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Win32'; -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub fix_path { diff --git a/lib/URI/file/Mac.pm b/lib/URI/file/Mac.pm index 014cd2c..db356fa 100644 --- a/lib/URI/file/Mac.pm +++ b/lib/URI/file/Mac.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub _file_extract_path { diff --git a/lib/URI/file/OS2.pm b/lib/URI/file/OS2.pm index a97dd35..71e59ff 100644 --- a/lib/URI/file/OS2.pm +++ b/lib/URI/file/OS2.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Win32'; -our $VERSION = '5.23'; +our $VERSION = '5.24'; # The Win32 version translates k:/foo to file://k:/foo (?!) # We add an empty host diff --git a/lib/URI/file/QNX.pm b/lib/URI/file/QNX.pm index fb67dbf..de6df80 100644 --- a/lib/URI/file/QNX.pm +++ b/lib/URI/file/QNX.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Unix'; -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub _file_extract_path { diff --git a/lib/URI/file/Unix.pm b/lib/URI/file/Unix.pm index 14dba86..f042328 100644 --- a/lib/URI/file/Unix.pm +++ b/lib/URI/file/Unix.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub _file_extract_path { diff --git a/lib/URI/file/Win32.pm b/lib/URI/file/Win32.pm index 72b2128..2ecf31b 100644 --- a/lib/URI/file/Win32.pm +++ b/lib/URI/file/Win32.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub _file_extract_authority { diff --git a/lib/URI/ftp.pm b/lib/URI/ftp.pm index 0b6be32..5c211af 100644 --- a/lib/URI/ftp.pm +++ b/lib/URI/ftp.pm @@ -3,7 +3,7 @@ package URI::ftp; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent qw(URI::_server URI::_userpass); diff --git a/lib/URI/gopher.pm b/lib/URI/gopher.pm index b35925d..3f92d7c 100644 --- a/lib/URI/gopher.pm +++ b/lib/URI/gopher.pm @@ -3,7 +3,7 @@ package URI::gopher; # , Dec 4, 1996 use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::_server'; diff --git a/lib/URI/http.pm b/lib/URI/http.pm index b439ad2..07db085 100644 --- a/lib/URI/http.pm +++ b/lib/URI/http.pm @@ -3,7 +3,7 @@ package URI::http; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::_server'; diff --git a/lib/URI/https.pm b/lib/URI/https.pm index d213d4c..0bef095 100644 --- a/lib/URI/https.pm +++ b/lib/URI/https.pm @@ -3,7 +3,7 @@ package URI::https; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::http'; diff --git a/lib/URI/icap.pm b/lib/URI/icap.pm index 9ba2ca7..ba4f4d6 100644 --- a/lib/URI/icap.pm +++ b/lib/URI/icap.pm @@ -4,7 +4,7 @@ use strict; use warnings; use base qw(URI::http); -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub default_port { return 1344 } diff --git a/lib/URI/icaps.pm b/lib/URI/icaps.pm index 22dd612..df0261b 100644 --- a/lib/URI/icaps.pm +++ b/lib/URI/icaps.pm @@ -4,7 +4,7 @@ use strict; use warnings; use base qw(URI::icap); -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub secure { return 1 } diff --git a/lib/URI/ldap.pm b/lib/URI/ldap.pm index 9485b00..7cb9a4e 100644 --- a/lib/URI/ldap.pm +++ b/lib/URI/ldap.pm @@ -7,7 +7,7 @@ package URI::ldap; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent qw(URI::_ldap URI::_server); diff --git a/lib/URI/ldapi.pm b/lib/URI/ldapi.pm index ff2e9de..46dbbb0 100644 --- a/lib/URI/ldapi.pm +++ b/lib/URI/ldapi.pm @@ -3,7 +3,7 @@ package URI::ldapi; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent qw(URI::_ldap URI::_generic); diff --git a/lib/URI/ldaps.pm b/lib/URI/ldaps.pm index 79dd402..806c452 100644 --- a/lib/URI/ldaps.pm +++ b/lib/URI/ldaps.pm @@ -3,7 +3,7 @@ package URI::ldaps; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::ldap'; diff --git a/lib/URI/mailto.pm b/lib/URI/mailto.pm index 0554d15..7574c19 100644 --- a/lib/URI/mailto.pm +++ b/lib/URI/mailto.pm @@ -3,7 +3,7 @@ package URI::mailto; # RFC 2368 use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent qw(URI URI::_query); diff --git a/lib/URI/mms.pm b/lib/URI/mms.pm index 7ebc298..2011dfb 100644 --- a/lib/URI/mms.pm +++ b/lib/URI/mms.pm @@ -3,7 +3,7 @@ package URI::mms; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::http'; diff --git a/lib/URI/news.pm b/lib/URI/news.pm index e94c6b6..1104514 100644 --- a/lib/URI/news.pm +++ b/lib/URI/news.pm @@ -3,7 +3,7 @@ package URI::news; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::_server'; diff --git a/lib/URI/nntp.pm b/lib/URI/nntp.pm index 80d84ed..8938951 100644 --- a/lib/URI/nntp.pm +++ b/lib/URI/nntp.pm @@ -3,7 +3,7 @@ package URI::nntp; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::news'; diff --git a/lib/URI/nntps.pm b/lib/URI/nntps.pm index 4c76d5e..cb22ab1 100644 --- a/lib/URI/nntps.pm +++ b/lib/URI/nntps.pm @@ -3,7 +3,7 @@ package URI::nntps; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::nntp'; diff --git a/lib/URI/pop.pm b/lib/URI/pop.pm index c36cf67..7dedea8 100644 --- a/lib/URI/pop.pm +++ b/lib/URI/pop.pm @@ -3,7 +3,7 @@ package URI::pop; # RFC 2384 use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::_server'; diff --git a/lib/URI/rlogin.pm b/lib/URI/rlogin.pm index 52589ea..08e26f9 100644 --- a/lib/URI/rlogin.pm +++ b/lib/URI/rlogin.pm @@ -3,7 +3,7 @@ package URI::rlogin; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::_login'; diff --git a/lib/URI/rsync.pm b/lib/URI/rsync.pm index 0ca5257..89f23e7 100644 --- a/lib/URI/rsync.pm +++ b/lib/URI/rsync.pm @@ -5,7 +5,7 @@ package URI::rsync; # http://rsync.samba.org/ use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent qw(URI::_server URI::_userpass); diff --git a/lib/URI/rtsp.pm b/lib/URI/rtsp.pm index 1cd44a8..452ebf7 100644 --- a/lib/URI/rtsp.pm +++ b/lib/URI/rtsp.pm @@ -3,7 +3,7 @@ package URI::rtsp; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::http'; diff --git a/lib/URI/rtspu.pm b/lib/URI/rtspu.pm index eb0495a..4b38168 100644 --- a/lib/URI/rtspu.pm +++ b/lib/URI/rtspu.pm @@ -3,7 +3,7 @@ package URI::rtspu; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::rtsp'; diff --git a/lib/URI/sftp.pm b/lib/URI/sftp.pm index 209adbc..073a1af 100644 --- a/lib/URI/sftp.pm +++ b/lib/URI/sftp.pm @@ -5,6 +5,6 @@ use warnings; use parent 'URI::ssh'; -our $VERSION = '5.23'; +our $VERSION = '5.24'; 1; diff --git a/lib/URI/sip.pm b/lib/URI/sip.pm index a04aebd..73706b6 100644 --- a/lib/URI/sip.pm +++ b/lib/URI/sip.pm @@ -14,7 +14,7 @@ use parent qw(URI::_server URI::_userpass); use URI::Escape (); -our $VERSION = '5.23'; +our $VERSION = '5.24'; sub default_port { 5060 } diff --git a/lib/URI/sips.pm b/lib/URI/sips.pm index 29d6cca..f9f147b 100644 --- a/lib/URI/sips.pm +++ b/lib/URI/sips.pm @@ -3,7 +3,7 @@ package URI::sips; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::sip'; diff --git a/lib/URI/snews.pm b/lib/URI/snews.pm index 8766793..c6850ec 100644 --- a/lib/URI/snews.pm +++ b/lib/URI/snews.pm @@ -3,7 +3,7 @@ package URI::snews; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::news'; diff --git a/lib/URI/ssh.pm b/lib/URI/ssh.pm index 890da31..ac5c745 100644 --- a/lib/URI/ssh.pm +++ b/lib/URI/ssh.pm @@ -3,7 +3,7 @@ package URI::ssh; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::_login'; diff --git a/lib/URI/telnet.pm b/lib/URI/telnet.pm index dd5681c..8e6dc81 100644 --- a/lib/URI/telnet.pm +++ b/lib/URI/telnet.pm @@ -3,7 +3,7 @@ package URI::telnet; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::_login'; diff --git a/lib/URI/tn3270.pm b/lib/URI/tn3270.pm index 9e033e2..2349388 100644 --- a/lib/URI/tn3270.pm +++ b/lib/URI/tn3270.pm @@ -3,7 +3,7 @@ package URI::tn3270; use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::_login'; diff --git a/lib/URI/urn.pm b/lib/URI/urn.pm index c06d841..5645287 100644 --- a/lib/URI/urn.pm +++ b/lib/URI/urn.pm @@ -3,7 +3,7 @@ package URI::urn; # RFC 2141 use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI'; diff --git a/lib/URI/urn/isbn.pm b/lib/URI/urn/isbn.pm index 0dc6ada..27c78b9 100644 --- a/lib/URI/urn/isbn.pm +++ b/lib/URI/urn/isbn.pm @@ -3,7 +3,7 @@ package URI::urn::isbn; # RFC 3187 use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::urn'; diff --git a/lib/URI/urn/oid.pm b/lib/URI/urn/oid.pm index 6e4fdf3..2c27941 100644 --- a/lib/URI/urn/oid.pm +++ b/lib/URI/urn/oid.pm @@ -3,7 +3,7 @@ package URI::urn::oid; # RFC 2061 use strict; use warnings; -our $VERSION = '5.23'; +our $VERSION = '5.24'; use parent 'URI::urn'; -- cgit v1.2.3 From 0c6923f2907d563bcea27fa02b945a2713025fe2 Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Thu, 25 Jan 2024 19:45:49 -0500 Subject: Revert "use Scalar::Util::reftype instead of ref to check for ARRAY" This reverts commit 1d5be19f48154101c671ec9fc40fdf483a55bdcd. --- Changes | 2 ++ lib/URI/_query.pm | 13 ++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Changes b/Changes index 305de7c..27a5c05 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for URI {{$NEXT}} + - Really revert "use Scalar::Util::reftype instead of ref to check for + ARRAY" (GH#136) (Olaf Alders) 5.23 2024-01-25 21:02:18Z - Revert the reftype change introduced in 5.22 as it causes warnings. diff --git a/lib/URI/_query.pm b/lib/URI/_query.pm index 4b24cb6..770697a 100644 --- a/lib/URI/_query.pm +++ b/lib/URI/_query.pm @@ -5,7 +5,6 @@ use warnings; use URI (); use URI::Escape qw(uri_unescape); -use Scalar::Util (); our $VERSION = '5.24'; @@ -35,7 +34,7 @@ sub query_form { # Try to set query string my $delim; my $r = $_[0]; - if (Scalar::Util::reftype($r) eq "ARRAY") { + if (ref($r) eq "ARRAY") { $delim = $_[1]; @_ = @$r; } @@ -50,7 +49,7 @@ sub query_form { $key = '' unless defined $key; $key =~ s/([;\/?:@&=+,\$\[\]%])/ URI::Escape::escape_char($1)/eg; $key =~ s/ /+/g; - $vals = [Scalar::Util::reftype($vals) eq "ARRAY" ? @$vals : $vals]; + $vals = [ref($vals) eq "ARRAY" ? @$vals : $vals]; for my $val (@$vals) { if (defined $val) { $val =~ s/([;\/?:@&=+,\$\[\]%])/ URI::Escape::escape_char($1)/eg; @@ -87,7 +86,7 @@ sub query_keywords if (@_) { # Try to set query string my @copy = @_; - @copy = @{$copy[0]} if @copy == 1 && Scalar::Util::reftype($copy[0]) eq "ARRAY"; + @copy = @{$copy[0]} if @copy == 1 && ref($copy[0]) eq "ARRAY"; for (@copy) { s/([;\/?:@&=+,\$\[\]%])/ URI::Escape::escape_char($1)/eg; } $self->query(@copy ? join('+', @copy) : undef); } @@ -115,7 +114,7 @@ sub query_param { if (@_) { my @new = @old; my @new_i = @i; - my @vals = map { Scalar::Util::reftype($_) eq 'ARRAY' ? @$_ : $_ } @_; + my @vals = map { ref($_) eq 'ARRAY' ? @$_ : $_ } @_; while (@new_i > @vals) { splice @new, pop @new_i, 2; @@ -140,7 +139,7 @@ sub query_param { sub query_param_append { my $self = shift; my $key = shift; - my @vals = map { Scalar::Util::reftype $_ eq 'ARRAY' ? @$_ : $_ } @_; + my @vals = map { ref $_ eq 'ARRAY' ? @$_ : $_ } @_; $self->query_form($self->query_form, $key => \@vals); # XXX return; } @@ -169,7 +168,7 @@ sub query_form_hash { while (my($k, $v) = splice(@old, 0, 2)) { if (exists $hash{$k}) { for ($hash{$k}) { - $_ = [$_] unless Scalar::Util::reftype($_) eq "ARRAY"; + $_ = [$_] unless ref($_) eq "ARRAY"; push(@$_, $v); } } -- cgit v1.2.3 From 33eec8628d04d4925b399ddd19d06b7c30f9bc2e Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Fri, 26 Jan 2024 04:38:48 +0000 Subject: URI-5.24 - Really revert "use Scalar::Util::reftype instead of ref to check for ARRAY" (GH#136) (Olaf Alders) --- Changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changes b/Changes index 27a5c05..8cf1fbd 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,6 @@ Revision history for URI -{{$NEXT}} +5.24 2024-01-26 04:36:32Z - Really revert "use Scalar::Util::reftype instead of ref to check for ARRAY" (GH#136) (Olaf Alders) -- cgit v1.2.3 From 7a68b6a1ed1271c3f1a9777200780ad679aeaffa Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Fri, 26 Jan 2024 04:38:48 +0000 Subject: increment $VERSION after 5.24 release --- Changes | 2 ++ lib/URI.pm | 2 +- lib/URI/Escape.pm | 2 +- lib/URI/Heuristic.pm | 2 +- lib/URI/IRI.pm | 2 +- lib/URI/QueryParam.pm | 2 +- lib/URI/Split.pm | 2 +- lib/URI/URL.pm | 2 +- lib/URI/WithBase.pm | 2 +- lib/URI/_foreign.pm | 2 +- lib/URI/_generic.pm | 2 +- lib/URI/_idna.pm | 2 +- lib/URI/_ldap.pm | 2 +- lib/URI/_login.pm | 2 +- lib/URI/_punycode.pm | 2 +- lib/URI/_query.pm | 2 +- lib/URI/_segment.pm | 2 +- lib/URI/_server.pm | 2 +- lib/URI/_userpass.pm | 2 +- lib/URI/data.pm | 2 +- lib/URI/file.pm | 2 +- lib/URI/file/Base.pm | 2 +- lib/URI/file/FAT.pm | 2 +- lib/URI/file/Mac.pm | 2 +- lib/URI/file/OS2.pm | 2 +- lib/URI/file/QNX.pm | 2 +- lib/URI/file/Unix.pm | 2 +- lib/URI/file/Win32.pm | 2 +- lib/URI/ftp.pm | 2 +- lib/URI/gopher.pm | 2 +- lib/URI/http.pm | 2 +- lib/URI/https.pm | 2 +- lib/URI/icap.pm | 2 +- lib/URI/icaps.pm | 2 +- lib/URI/ldap.pm | 2 +- lib/URI/ldapi.pm | 2 +- lib/URI/ldaps.pm | 2 +- lib/URI/mailto.pm | 2 +- lib/URI/mms.pm | 2 +- lib/URI/news.pm | 2 +- lib/URI/nntp.pm | 2 +- lib/URI/nntps.pm | 2 +- lib/URI/pop.pm | 2 +- lib/URI/rlogin.pm | 2 +- lib/URI/rsync.pm | 2 +- lib/URI/rtsp.pm | 2 +- lib/URI/rtspu.pm | 2 +- lib/URI/sftp.pm | 2 +- lib/URI/sip.pm | 2 +- lib/URI/sips.pm | 2 +- lib/URI/snews.pm | 2 +- lib/URI/ssh.pm | 2 +- lib/URI/telnet.pm | 2 +- lib/URI/tn3270.pm | 2 +- lib/URI/urn.pm | 2 +- lib/URI/urn/isbn.pm | 2 +- lib/URI/urn/oid.pm | 2 +- 57 files changed, 58 insertions(+), 56 deletions(-) diff --git a/Changes b/Changes index 8cf1fbd..7e7f3e7 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,7 @@ Revision history for URI +{{$NEXT}} + 5.24 2024-01-26 04:36:32Z - Really revert "use Scalar::Util::reftype instead of ref to check for ARRAY" (GH#136) (Olaf Alders) diff --git a/lib/URI.pm b/lib/URI.pm index 58eab43..ec71d57 100644 --- a/lib/URI.pm +++ b/lib/URI.pm @@ -3,7 +3,7 @@ package URI; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; # 1=version 5.10 and earlier; 0=version 5.11 and later use constant HAS_RESERVED_SQUARE_BRACKETS => $ENV{URI_HAS_RESERVED_SQUARE_BRACKETS} ? 1 : 0; diff --git a/lib/URI/Escape.pm b/lib/URI/Escape.pm index 3a25e79..d9de202 100644 --- a/lib/URI/Escape.pm +++ b/lib/URI/Escape.pm @@ -148,7 +148,7 @@ use Exporter 5.57 'import'; our %escapes; our @EXPORT = qw(uri_escape uri_unescape uri_escape_utf8); our @EXPORT_OK = qw(%escapes); -our $VERSION = '5.24'; +our $VERSION = '5.25'; use Carp (); diff --git a/lib/URI/Heuristic.pm b/lib/URI/Heuristic.pm index 1605570..5d8013f 100644 --- a/lib/URI/Heuristic.pm +++ b/lib/URI/Heuristic.pm @@ -91,7 +91,7 @@ use warnings; use Exporter 5.57 'import'; our @EXPORT_OK = qw(uf_uri uf_uristr uf_url uf_urlstr); -our $VERSION = '5.24'; +our $VERSION = '5.25'; our ($MY_COUNTRY, $DEBUG); diff --git a/lib/URI/IRI.pm b/lib/URI/IRI.pm index f576e06..1e7a3e7 100644 --- a/lib/URI/IRI.pm +++ b/lib/URI/IRI.pm @@ -8,7 +8,7 @@ use URI (); use overload '""' => sub { shift->as_string }; -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub new { my($class, $uri, $scheme) = @_; diff --git a/lib/URI/QueryParam.pm b/lib/URI/QueryParam.pm index 0ab9dd9..a29047c 100644 --- a/lib/URI/QueryParam.pm +++ b/lib/URI/QueryParam.pm @@ -2,7 +2,7 @@ package URI::QueryParam; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; 1; diff --git a/lib/URI/Split.pm b/lib/URI/Split.pm index e6763c7..03cdd54 100644 --- a/lib/URI/Split.pm +++ b/lib/URI/Split.pm @@ -3,7 +3,7 @@ package URI::Split; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use Exporter 5.57 'import'; our @EXPORT_OK = qw(uri_split uri_join); diff --git a/lib/URI/URL.pm b/lib/URI/URL.pm index 11fe460..23b8d6b 100644 --- a/lib/URI/URL.pm +++ b/lib/URI/URL.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::WithBase'; -our $VERSION = '5.24'; +our $VERSION = '5.25'; # Provide as much as possible of the old URI::URL interface for backwards # compatibility... diff --git a/lib/URI/WithBase.pm b/lib/URI/WithBase.pm index f2a295e..bd4666e 100644 --- a/lib/URI/WithBase.pm +++ b/lib/URI/WithBase.pm @@ -6,7 +6,7 @@ use warnings; use URI (); use Scalar::Util qw(blessed); -our $VERSION = '5.24'; +our $VERSION = '5.25'; use overload '""' => "as_string", fallback => 1; diff --git a/lib/URI/_foreign.pm b/lib/URI/_foreign.pm index 9ae0511..653f59f 100644 --- a/lib/URI/_foreign.pm +++ b/lib/URI/_foreign.pm @@ -5,6 +5,6 @@ use warnings; use parent 'URI::_generic'; -our $VERSION = '5.24'; +our $VERSION = '5.25'; 1; diff --git a/lib/URI/_generic.pm b/lib/URI/_generic.pm index 99d0605..b19f08c 100644 --- a/lib/URI/_generic.pm +++ b/lib/URI/_generic.pm @@ -8,7 +8,7 @@ use parent qw(URI URI::_query); use URI::Escape qw(uri_unescape); use Carp (); -our $VERSION = '5.24'; +our $VERSION = '5.25'; my $ACHAR = URI::HAS_RESERVED_SQUARE_BRACKETS ? $URI::uric : $URI::uric4host; $ACHAR =~ s,\\[/?],,g; my $PCHAR = $URI::uric; $PCHAR =~ s,\\[?],,g; diff --git a/lib/URI/_idna.pm b/lib/URI/_idna.pm index 20dcc35..dce253f 100644 --- a/lib/URI/_idna.pm +++ b/lib/URI/_idna.pm @@ -9,7 +9,7 @@ use warnings; use URI::_punycode qw(decode_punycode encode_punycode); use Carp qw(croak); -our $VERSION = '5.24'; +our $VERSION = '5.25'; BEGIN { *URI::_idna::_ENV_::JOIN_LEAKS_UTF8_FLAGS = "$]" < 5.008_003 diff --git a/lib/URI/_ldap.pm b/lib/URI/_ldap.pm index 145deba..1307892 100644 --- a/lib/URI/_ldap.pm +++ b/lib/URI/_ldap.pm @@ -7,7 +7,7 @@ package URI::_ldap; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use URI::Escape qw(uri_unescape); diff --git a/lib/URI/_login.pm b/lib/URI/_login.pm index e78858c..efc7f72 100644 --- a/lib/URI/_login.pm +++ b/lib/URI/_login.pm @@ -5,7 +5,7 @@ use warnings; use parent qw(URI::_server URI::_userpass); -our $VERSION = '5.24'; +our $VERSION = '5.25'; # Generic terminal logins. This is used as a base class for 'telnet', # 'tn3270', and 'rlogin' URL schemes. diff --git a/lib/URI/_punycode.pm b/lib/URI/_punycode.pm index 3cc3155..069cd57 100644 --- a/lib/URI/_punycode.pm +++ b/lib/URI/_punycode.pm @@ -3,7 +3,7 @@ package URI::_punycode; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use Exporter 'import'; our @EXPORT = qw(encode_punycode decode_punycode); diff --git a/lib/URI/_query.pm b/lib/URI/_query.pm index 770697a..d586817 100644 --- a/lib/URI/_query.pm +++ b/lib/URI/_query.pm @@ -6,7 +6,7 @@ use warnings; use URI (); use URI::Escape qw(uri_unescape); -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub query { diff --git a/lib/URI/_segment.pm b/lib/URI/_segment.pm index 8d462c9..ba2ccaa 100644 --- a/lib/URI/_segment.pm +++ b/lib/URI/_segment.pm @@ -11,7 +11,7 @@ use URI::Escape qw(uri_unescape); use overload '""' => sub { $_[0]->[0] }, fallback => 1; -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub new { diff --git a/lib/URI/_server.pm b/lib/URI/_server.pm index e4cb442..594cc3e 100644 --- a/lib/URI/_server.pm +++ b/lib/URI/_server.pm @@ -7,7 +7,7 @@ use parent 'URI::_generic'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub _uric_escape { my($class, $str) = @_; diff --git a/lib/URI/_userpass.pm b/lib/URI/_userpass.pm index e0960a4..2979710 100644 --- a/lib/URI/_userpass.pm +++ b/lib/URI/_userpass.pm @@ -5,7 +5,7 @@ use warnings; use URI::Escape qw(uri_unescape); -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub user { diff --git a/lib/URI/data.pm b/lib/URI/data.pm index 3287591..28b2041 100644 --- a/lib/URI/data.pm +++ b/lib/URI/data.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI'; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use MIME::Base64 qw(decode_base64 encode_base64); use URI::Escape qw(uri_unescape); diff --git a/lib/URI/file.pm b/lib/URI/file.pm index 23aee67..a6792fe 100644 --- a/lib/URI/file.pm +++ b/lib/URI/file.pm @@ -4,7 +4,7 @@ use strict; use warnings; use parent 'URI::_generic'; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use URI::Escape qw(uri_unescape); diff --git a/lib/URI/file/Base.pm b/lib/URI/file/Base.pm index dd9dd26..676b834 100644 --- a/lib/URI/file/Base.pm +++ b/lib/URI/file/Base.pm @@ -5,7 +5,7 @@ use warnings; use URI::Escape (); -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub new { diff --git a/lib/URI/file/FAT.pm b/lib/URI/file/FAT.pm index 50036dc..553d46a 100644 --- a/lib/URI/file/FAT.pm +++ b/lib/URI/file/FAT.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Win32'; -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub fix_path { diff --git a/lib/URI/file/Mac.pm b/lib/URI/file/Mac.pm index db356fa..9840eed 100644 --- a/lib/URI/file/Mac.pm +++ b/lib/URI/file/Mac.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub _file_extract_path { diff --git a/lib/URI/file/OS2.pm b/lib/URI/file/OS2.pm index 71e59ff..9fbfa40 100644 --- a/lib/URI/file/OS2.pm +++ b/lib/URI/file/OS2.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Win32'; -our $VERSION = '5.24'; +our $VERSION = '5.25'; # The Win32 version translates k:/foo to file://k:/foo (?!) # We add an empty host diff --git a/lib/URI/file/QNX.pm b/lib/URI/file/QNX.pm index de6df80..55c375d 100644 --- a/lib/URI/file/QNX.pm +++ b/lib/URI/file/QNX.pm @@ -5,7 +5,7 @@ use warnings; use parent 'URI::file::Unix'; -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub _file_extract_path { diff --git a/lib/URI/file/Unix.pm b/lib/URI/file/Unix.pm index f042328..5f227c7 100644 --- a/lib/URI/file/Unix.pm +++ b/lib/URI/file/Unix.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub _file_extract_path { diff --git a/lib/URI/file/Win32.pm b/lib/URI/file/Win32.pm index 2ecf31b..faac7db 100644 --- a/lib/URI/file/Win32.pm +++ b/lib/URI/file/Win32.pm @@ -7,7 +7,7 @@ use parent 'URI::file::Base'; use URI::Escape qw(uri_unescape); -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub _file_extract_authority { diff --git a/lib/URI/ftp.pm b/lib/URI/ftp.pm index 5c211af..2bfb2d6 100644 --- a/lib/URI/ftp.pm +++ b/lib/URI/ftp.pm @@ -3,7 +3,7 @@ package URI::ftp; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent qw(URI::_server URI::_userpass); diff --git a/lib/URI/gopher.pm b/lib/URI/gopher.pm index 3f92d7c..9fb51bc 100644 --- a/lib/URI/gopher.pm +++ b/lib/URI/gopher.pm @@ -3,7 +3,7 @@ package URI::gopher; # , Dec 4, 1996 use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::_server'; diff --git a/lib/URI/http.pm b/lib/URI/http.pm index 07db085..71dce0b 100644 --- a/lib/URI/http.pm +++ b/lib/URI/http.pm @@ -3,7 +3,7 @@ package URI::http; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::_server'; diff --git a/lib/URI/https.pm b/lib/URI/https.pm index 0bef095..3528e56 100644 --- a/lib/URI/https.pm +++ b/lib/URI/https.pm @@ -3,7 +3,7 @@ package URI::https; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::http'; diff --git a/lib/URI/icap.pm b/lib/URI/icap.pm index ba4f4d6..7805095 100644 --- a/lib/URI/icap.pm +++ b/lib/URI/icap.pm @@ -4,7 +4,7 @@ use strict; use warnings; use base qw(URI::http); -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub default_port { return 1344 } diff --git a/lib/URI/icaps.pm b/lib/URI/icaps.pm index df0261b..a1b974a 100644 --- a/lib/URI/icaps.pm +++ b/lib/URI/icaps.pm @@ -4,7 +4,7 @@ use strict; use warnings; use base qw(URI::icap); -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub secure { return 1 } diff --git a/lib/URI/ldap.pm b/lib/URI/ldap.pm index 7cb9a4e..6335db5 100644 --- a/lib/URI/ldap.pm +++ b/lib/URI/ldap.pm @@ -7,7 +7,7 @@ package URI::ldap; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent qw(URI::_ldap URI::_server); diff --git a/lib/URI/ldapi.pm b/lib/URI/ldapi.pm index 46dbbb0..032747e 100644 --- a/lib/URI/ldapi.pm +++ b/lib/URI/ldapi.pm @@ -3,7 +3,7 @@ package URI::ldapi; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent qw(URI::_ldap URI::_generic); diff --git a/lib/URI/ldaps.pm b/lib/URI/ldaps.pm index 806c452..f1b1a11 100644 --- a/lib/URI/ldaps.pm +++ b/lib/URI/ldaps.pm @@ -3,7 +3,7 @@ package URI::ldaps; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::ldap'; diff --git a/lib/URI/mailto.pm b/lib/URI/mailto.pm index 7574c19..3bc03d7 100644 --- a/lib/URI/mailto.pm +++ b/lib/URI/mailto.pm @@ -3,7 +3,7 @@ package URI::mailto; # RFC 2368 use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent qw(URI URI::_query); diff --git a/lib/URI/mms.pm b/lib/URI/mms.pm index 2011dfb..bfa9cae 100644 --- a/lib/URI/mms.pm +++ b/lib/URI/mms.pm @@ -3,7 +3,7 @@ package URI::mms; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::http'; diff --git a/lib/URI/news.pm b/lib/URI/news.pm index 1104514..40d4da6 100644 --- a/lib/URI/news.pm +++ b/lib/URI/news.pm @@ -3,7 +3,7 @@ package URI::news; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::_server'; diff --git a/lib/URI/nntp.pm b/lib/URI/nntp.pm index 8938951..d60ad38 100644 --- a/lib/URI/nntp.pm +++ b/lib/URI/nntp.pm @@ -3,7 +3,7 @@ package URI::nntp; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::news'; diff --git a/lib/URI/nntps.pm b/lib/URI/nntps.pm index cb22ab1..5e054fd 100644 --- a/lib/URI/nntps.pm +++ b/lib/URI/nntps.pm @@ -3,7 +3,7 @@ package URI::nntps; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::nntp'; diff --git a/lib/URI/pop.pm b/lib/URI/pop.pm index 7dedea8..dcf0851 100644 --- a/lib/URI/pop.pm +++ b/lib/URI/pop.pm @@ -3,7 +3,7 @@ package URI::pop; # RFC 2384 use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::_server'; diff --git a/lib/URI/rlogin.pm b/lib/URI/rlogin.pm index 08e26f9..5c12ff5 100644 --- a/lib/URI/rlogin.pm +++ b/lib/URI/rlogin.pm @@ -3,7 +3,7 @@ package URI::rlogin; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::_login'; diff --git a/lib/URI/rsync.pm b/lib/URI/rsync.pm index 89f23e7..8bf51b6 100644 --- a/lib/URI/rsync.pm +++ b/lib/URI/rsync.pm @@ -5,7 +5,7 @@ package URI::rsync; # http://rsync.samba.org/ use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent qw(URI::_server URI::_userpass); diff --git a/lib/URI/rtsp.pm b/lib/URI/rtsp.pm index 452ebf7..431a506 100644 --- a/lib/URI/rtsp.pm +++ b/lib/URI/rtsp.pm @@ -3,7 +3,7 @@ package URI::rtsp; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::http'; diff --git a/lib/URI/rtspu.pm b/lib/URI/rtspu.pm index 4b38168..d6b993f 100644 --- a/lib/URI/rtspu.pm +++ b/lib/URI/rtspu.pm @@ -3,7 +3,7 @@ package URI::rtspu; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::rtsp'; diff --git a/lib/URI/sftp.pm b/lib/URI/sftp.pm index 073a1af..6588291 100644 --- a/lib/URI/sftp.pm +++ b/lib/URI/sftp.pm @@ -5,6 +5,6 @@ use warnings; use parent 'URI::ssh'; -our $VERSION = '5.24'; +our $VERSION = '5.25'; 1; diff --git a/lib/URI/sip.pm b/lib/URI/sip.pm index 73706b6..6ceb403 100644 --- a/lib/URI/sip.pm +++ b/lib/URI/sip.pm @@ -14,7 +14,7 @@ use parent qw(URI::_server URI::_userpass); use URI::Escape (); -our $VERSION = '5.24'; +our $VERSION = '5.25'; sub default_port { 5060 } diff --git a/lib/URI/sips.pm b/lib/URI/sips.pm index f9f147b..58d41d4 100644 --- a/lib/URI/sips.pm +++ b/lib/URI/sips.pm @@ -3,7 +3,7 @@ package URI::sips; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::sip'; diff --git a/lib/URI/snews.pm b/lib/URI/snews.pm index c6850ec..fc9434c 100644 --- a/lib/URI/snews.pm +++ b/lib/URI/snews.pm @@ -3,7 +3,7 @@ package URI::snews; # draft-gilman-news-url-01 use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::news'; diff --git a/lib/URI/ssh.pm b/lib/URI/ssh.pm index ac5c745..806af71 100644 --- a/lib/URI/ssh.pm +++ b/lib/URI/ssh.pm @@ -3,7 +3,7 @@ package URI::ssh; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::_login'; diff --git a/lib/URI/telnet.pm b/lib/URI/telnet.pm index 8e6dc81..77a3e38 100644 --- a/lib/URI/telnet.pm +++ b/lib/URI/telnet.pm @@ -3,7 +3,7 @@ package URI::telnet; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::_login'; diff --git a/lib/URI/tn3270.pm b/lib/URI/tn3270.pm index 2349388..518ab8a 100644 --- a/lib/URI/tn3270.pm +++ b/lib/URI/tn3270.pm @@ -3,7 +3,7 @@ package URI::tn3270; use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::_login'; diff --git a/lib/URI/urn.pm b/lib/URI/urn.pm index 5645287..fe61b54 100644 --- a/lib/URI/urn.pm +++ b/lib/URI/urn.pm @@ -3,7 +3,7 @@ package URI::urn; # RFC 2141 use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI'; diff --git a/lib/URI/urn/isbn.pm b/lib/URI/urn/isbn.pm index 27c78b9..4087146 100644 --- a/lib/URI/urn/isbn.pm +++ b/lib/URI/urn/isbn.pm @@ -3,7 +3,7 @@ package URI::urn::isbn; # RFC 3187 use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::urn'; diff --git a/lib/URI/urn/oid.pm b/lib/URI/urn/oid.pm index 2c27941..f5582b7 100644 --- a/lib/URI/urn/oid.pm +++ b/lib/URI/urn/oid.pm @@ -3,7 +3,7 @@ package URI::urn::oid; # RFC 2061 use strict; use warnings; -our $VERSION = '5.24'; +our $VERSION = '5.25'; use parent 'URI::urn'; -- cgit v1.2.3 From ebb0b5dfeb5ccf6b214ccff3e327eec4d95c2007 Mon Sep 17 00:00:00 2001 From: Matthew Chae Date: Wed, 24 Oct 2018 16:24:25 +0100 Subject: cache scheme so it never attempt to load it again (gh #54) --- lib/URI.pm | 2 ++ t/scheme-exceptions.t | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/URI.pm b/lib/URI.pm index ec71d57..d6f175b 100644 --- a/lib/URI.pm +++ b/lib/URI.pm @@ -181,6 +181,8 @@ sub implementor # check we actually have one for the scheme: unless (@{"${ic}::ISA"}) { if (not exists $require_attempted{$ic}) { + $require_attempted{$ic} = 1; + # Try to load it my $_old_error = $@; eval "require $ic"; diff --git a/t/scheme-exceptions.t b/t/scheme-exceptions.t index e400591..ff498dc 100644 --- a/t/scheme-exceptions.t +++ b/t/scheme-exceptions.t @@ -4,14 +4,15 @@ use warnings; use Test::More; use URI (); -plan skip_all => 'this test assumes that URI::notreal does not exist' - if eval { +require URI::notreal }; - -for (0..1) { +require URI::_foreign; # load this before disabling @INC +my $count = 0; +local @INC = (sub { ++$count; return }); +for (0 .. 1) { my $uri = URI->new('notreal://foo/bar'); - - is($@, '', 'no exception when trying to load a scheme handler class'); + is($count, 1, 'only attempt to load the scheme package once'); + is($@, '', 'no exception when trying to load a scheme handler class'); ok($uri->isa('URI'), 'but URI still instantiated as foreign'); + diag $count; } done_testing; -- cgit v1.2.3 From b183b02e9e2bca29a098c2145bc00ec9f64049ee Mon Sep 17 00:00:00 2001 From: Matthew Chae Date: Wed, 24 Oct 2018 16:28:41 +0100 Subject: revert commit 114f948466c0fb10edcbec8b2915dcecc9fa1f77 (gh #54) The existing code falls back to URI::urn and already caches the implementor after it's done. It therefore can never try to load one twice if it previously failed. --- lib/URI/urn.pm | 4 ---- t/urn-scheme-exceptions.t | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 t/urn-scheme-exceptions.t diff --git a/lib/URI/urn.pm b/lib/URI/urn.pm index fe61b54..833c3cc 100644 --- a/lib/URI/urn.pm +++ b/lib/URI/urn.pm @@ -10,7 +10,6 @@ use parent 'URI'; use Carp qw(carp); my %implementor; -my %require_attempted; sub _init { my $class = shift; @@ -30,13 +29,11 @@ sub _init { $impclass = "URI::urn::$id"; no strict 'refs'; unless (@{"${impclass}::ISA"}) { - if (not exists $require_attempted{$impclass}) { # Try to load it my $_old_error = $@; eval "require $impclass"; die $@ if $@ && $@ !~ /Can\'t locate.*in \@INC/; $@ = $_old_error; - } $impclass = "URI::urn" unless @{"${impclass}::ISA"}; } } @@ -44,7 +41,6 @@ sub _init { carp("Illegal namespace identifier '$nid' for URN '$self'") if $^W; } $implementor{$nid} = $impclass; - return $impclass->_urn_init($self, $nid); } diff --git a/t/urn-scheme-exceptions.t b/t/urn-scheme-exceptions.t new file mode 100644 index 0000000..597a695 --- /dev/null +++ b/t/urn-scheme-exceptions.t @@ -0,0 +1,19 @@ +use strict; +use warnings; + +use Test::More; +use URI::urn; + +plan tests => 6; + +{ + require URI::_foreign; # load this before disabling @INC + my $count = 0; + local @INC = sub { $count++; return }; + for ( 0 .. 1 ) { + my $uri = URI->new('urn:asdfasdf:1.2.3.4.5.6.7.8.9.10'); + is( $count, 1, 'only attempt to load the scheme package once' ); + is( $@, '', 'no exception when trying to load a scheme handler class' ); + ok( $uri->isa('URI'), 'but URI still instantiated as foreign' ); + } +} -- cgit v1.2.3 From 0069acc712c892ce9a268c01a9a5a6d8f5ca191a Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Thu, 25 Jan 2024 10:53:28 -0500 Subject: Update Changes --- Changes | 1 + 1 file changed, 1 insertion(+) diff --git a/Changes b/Changes index 7e7f3e7..866aa36 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,7 @@ Revision history for URI {{$NEXT}} + - cache scheme so it never attempt to load it again (GH#55) (mschae94) 5.24 2024-01-26 04:36:32Z - Really revert "use Scalar::Util::reftype instead of ref to check for -- cgit v1.2.3 From 57a897a41d7320df1a442f9a1621ebed7717961d Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Sat, 27 Jan 2024 16:12:04 +0000 Subject: URI-5.25 - cache scheme so it never attempt to load it again (GH#55) (mschae94) --- Changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changes b/Changes index 866aa36..7277353 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,6 @@ Revision history for URI -{{$NEXT}} +5.25 2024-01-27 16:11:41Z - cache scheme so it never attempt to load it again (GH#55) (mschae94) 5.24 2024-01-26 04:36:32Z -- cgit v1.2.3