diff options
| author | Anatol Belski <ab@php.net> | 2017-10-21 17:24:42 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-21 17:24:42 +0200 |
| commit | bb0a15f4990d9b65b8288f840d1672bb05483b55 (patch) | |
| tree | 10f73b57535852eac48e4405e2dff6f8bc74557b | |
| parent | ff1b1c27616e0681ab5447f362a15fa3fc53ffa9 (diff) | |
| parent | e986f71527522467e7265b18242a42d3f7fc69e5 (diff) | |
| download | php-git-bb0a15f4990d9b65b8288f840d1672bb05483b55.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
With ICU 58+, set the default restriction level to high
| -rw-r--r-- | ext/intl/spoofchecker/spoofchecker_class.h | 2 | ||||
| -rw-r--r-- | ext/intl/spoofchecker/spoofchecker_create.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ext/intl/spoofchecker/spoofchecker_class.h b/ext/intl/spoofchecker/spoofchecker_class.h index 7a95f315dc..d6f2c2d543 100644 --- a/ext/intl/spoofchecker/spoofchecker_class.h +++ b/ext/intl/spoofchecker/spoofchecker_class.h @@ -78,6 +78,6 @@ extern zend_class_entry *Spoofchecker_ce_ptr; RETURN_FALSE; \ } \ -#define SPOOFCHECKER_DEFAULT_RESTRICTION_LEVEL USPOOF_MODERATELY_RESTRICTIVE +#define SPOOFCHECKER_DEFAULT_RESTRICTION_LEVEL USPOOF_HIGHLY_RESTRICTIVE #endif // #ifndef SPOOFCHECKER_CLASS_H diff --git a/ext/intl/spoofchecker/spoofchecker_create.c b/ext/intl/spoofchecker/spoofchecker_create.c index 1333a0f205..8108cafa2f 100644 --- a/ext/intl/spoofchecker/spoofchecker_create.c +++ b/ext/intl/spoofchecker/spoofchecker_create.c @@ -48,11 +48,9 @@ PHP_METHOD(Spoofchecker, __construct) /* ICU 58 removes WSC and MSC handling. However there are restriction levels as defined in http://www.unicode.org/reports/tr39/tr39-15.html#Restriction_Level_Detection - and the default is high restrictive. However the moderately restrictive - level is what seems to correspond to the setting below applicable to - ICU < 58. In further, we might want to utilize uspoof_check2 APIs when - it became stable, to use extended check result APIs. Subsequent changes - in the unicode security algos are to be watched.*/ + and the default is high restrictive. In further, we might want to utilize + uspoof_check2 APIs when it became stable, to use extended check result APIs. + Subsequent changes in the unicode security algos are to be watched.*/ uspoof_setRestrictionLevel(co->uspoof, SPOOFCHECKER_DEFAULT_RESTRICTION_LEVEL); #else /* Single-script enforcement is on by default. This fails for languages |