diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-04-26 11:36:42 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-04-26 11:36:42 +0000 |
| commit | ab9e33b6ab8ddf8cd7fc3f534e2f48d8e9d1f235 (patch) | |
| tree | 0f50009045f8011a64469a0214219d010d0d5feb /roundcubemail/program/js | |
| parent | 23eb3efad3dc0a203c7b376adf6a8a8a95943c2e (diff) | |
- Fix handling of top-level domains with more than 5 chars or unicode chars (#1487883)
git-svn-id: https://svn.roundcube.net/trunk@4702 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/js')
| -rw-r--r-- | roundcubemail/program/js/common.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/js/common.js b/roundcubemail/program/js/common.js index 4d3cbfac1..00c4b001b 100644 --- a/roundcubemail/program/js/common.js +++ b/roundcubemail/program/js/common.js @@ -493,8 +493,8 @@ function rcube_check_email(input, inline) // So, e-mail address should be validated also on server side after idn_to_ascii() use //domain_literal = '\\x5b('+dtext+'|'+quoted_pair+')*\\x5d', //sub_domain = '('+atom+'|'+domain_literal+')', - // allow punycode in last domain part for ICANN test domains - domain = '([^@\\x2e]+\\x2e)+([a-z]{2,}|xn--[a-z0-9]{2,})', + // allow punycode/unicode top-level domain + domain = '([^@\\x2e]+\\x2e)+([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})', // ICANN e-mail test (http://idn.icann.org/E-mail_test) icann_domains = [ '\\u0645\\u062b\\u0627\\u0644\\x2e\\u0625\\u062e\\u062a\\u0628\\u0627\\u0631', |