summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/classes
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-11-26 16:26:09 +0545
committerRenato Botelho <renato@netgate.com>2016-11-29 14:40:23 -0200
commit6cade780b17c65e720b7aed0669af754e1038a36 (patch)
tree4902461c00c3409485b26aad74ed87c983d6e5de /src/usr/local/www/classes
parent6e6235801776e3c66f85cd1aea3c5e13e4debeee (diff)
downloadpfsense-6cade780b17c65e720b7aed0669af754e1038a36.zip
pfsense-6cade780b17c65e720b7aed0669af754e1038a36.tar.gz
IPv6 address can contain a dot
When requiring the entry of an IPv6 address, the regex pattern should still allow a dot, so that an IPv6 address can be entered in the format that has an IPv4-address-like part at the end: aa:bb:cc:dd:ee:ff:1.2.3.4 which is a valid way to choose to specify an IPv6 address. (cherry picked from commit b8678b6385a9ba245e92a06b19cfa397873eef77)
Diffstat (limited to 'src/usr/local/www/classes')
-rw-r--r--src/usr/local/www/classes/Form/IpAddress.class.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/usr/local/www/classes/Form/IpAddress.class.php b/src/usr/local/www/classes/Form/IpAddress.class.php
index 5e03972..28ca402 100644
--- a/src/usr/local/www/classes/Form/IpAddress.class.php
+++ b/src/usr/local/www/classes/Form/IpAddress.class.php
@@ -71,7 +71,7 @@ class Form_IpAddress extends Form_Input
break;
case "V6":
- $this->_attributes['pattern'] = '[a-fA-F0-9:]*';
+ $this->_attributes['pattern'] = '[a-fA-F0-9:.]*';
$this->_attributes['title'] = 'An IPv6 address like 1:2a:3b:ffff::1';
break;
}
OpenPOWER on IntegriCloud