diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-16 18:38:28 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-16 18:38:28 +0200 |
| commit | 273d926b08a93f2f8856169443961b6d683d6955 (patch) | |
| tree | 9440e632fd6d3bd32cd3bdfcc569fcabea2d3e06 /phpBB/develop/regex.php | |
| parent | e6b9178c4439f14b085470f7f16c1fee67262296 (diff) | |
| parent | 1d2b4ffc651bc1f39849c643e69193926611f2ec (diff) | |
| download | forums-273d926b08a93f2f8856169443961b6d683d6955.tar forums-273d926b08a93f2f8856169443961b6d683d6955.tar.gz forums-273d926b08a93f2f8856169443961b6d683d6955.tar.bz2 forums-273d926b08a93f2f8856169443961b6d683d6955.tar.xz forums-273d926b08a93f2f8856169443961b6d683d6955.zip | |
Merge branch 'ticket/aptx/9525' into develop-olympus
* ticket/aptx/9525:
[ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
Diffstat (limited to 'phpBB/develop/regex.php')
| -rw-r--r-- | phpBB/develop/regex.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php index 4498204b4a..8165ba1f21 100644 --- a/phpBB/develop/regex.php +++ b/phpBB/develop/regex.php @@ -18,14 +18,15 @@ $ls32 = "(?:$h16:$h16|$ipv4)"; $ipv6_construct = array( array(false, '', '{6}', $ls32), - array(false, '::', '{5}', $ls32), + array(false, '::', '{0,5}', "(?:$h16(?::$h16)?|$ipv4)"), array('', ':', '{4}', $ls32), array('{1,2}', ':', '{3}', $ls32), array('{1,3}', ':', '{2}', $ls32), array('{1,4}', ':', '', $ls32), array('{1,5}', ':', false, $ls32), array('{1,6}', ':', false, $h16), - array('{1,7}', ':', false, '') + array('{1,7}', ':', false, ''), + array(false, '::', false, '') ); $ipv6 = '(?:'; |