From d08ee23dccf56af292a9616986e58cc39386e3fb Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 8 Nov 2019 06:53:19 +0100
Subject: Remove deprecated/buggy 'o' regexp modifier.

---
 lib/Net/IMAP/InterIMAP.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/Net/IMAP/InterIMAP.pm b/lib/Net/IMAP/InterIMAP.pm
index 3d5bdcf..77c1b14 100644
--- a/lib/Net/IMAP/InterIMAP.pm
+++ b/lib/Net/IMAP/InterIMAP.pm
@@ -1408,10 +1408,10 @@ sub _ssl_error($$@) {
 # RFC 3986 appendix A
 my $RE_IPv4 = do {
     my $dec = qr/[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]/;
-    qr/$dec(?:\.$dec){3}/o };
+    qr/$dec(?:\.$dec){3}/ };
 my $RE_IPv6 = do {
     my $h16  = qr/[0-9A-Fa-f]{1,4}/;
-    my $ls32 = qr/$h16:$h16|$RE_IPv4/o;
+    my $ls32 = qr/$h16:$h16|$RE_IPv4/;
     qr/                                  (?: $h16 : ){6} $ls32
       |                               :: (?: $h16 : ){5} $ls32
       | (?:                   $h16 )? :: (?: $h16 : ){4} $ls32
@@ -1421,7 +1421,7 @@ my $RE_IPv6 = do {
       | (?: (?: $h16 : ){0,4} $h16 )? ::                 $ls32
       | (?: (?: $h16 : ){0,5} $h16 )? ::                 $h16
       | (?: (?: $h16 : ){0,6} $h16 )? ::
-      /xo };
+      /x };
 
 
 # Opens a TCP socket to the given $host and $port.
@@ -1429,11 +1429,10 @@ sub _tcp_connect($$$) {
     my ($self, $host, $port) = @_;
 
     my %hints = (socktype => SOCK_STREAM, protocol => IPPROTO_TCP);
-    if ($host =~ qr/\A$RE_IPv4\z/o) {
+    if ($host =~ qr/\A$RE_IPv4\z/) {
         $hints{family} = AF_INET;
         $hints{flags} |= AI_NUMERICHOST;
-    }
-    elsif ($host =~ qr/\A\[($RE_IPv6)\]\z/o) {
+    } elsif ($host =~ qr/\A\[($RE_IPv6)\]\z/) {
         $host = $1;
         $hints{family} = AF_INET6;
         $hints{flags} |= AI_NUMERICHOST;
-- 
cgit v1.2.3