diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-08 16:14:06 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-08 16:14:06 +0200 |
| commit | 68b26ff8cf2390ba5b7565b6624485f2ee6afbf6 (patch) | |
| tree | fcad3c0729ae1ad1dc0ded9920348d1ad23f9056 /ext/pcre/php_pcre.c | |
| parent | 9004102b99be4d3811d69ad61149dc2959579e0a (diff) | |
| parent | 736af5f6602145a267dcd9d795414a6dbffa07dc (diff) | |
| download | php-git-68b26ff8cf2390ba5b7565b6624485f2ee6afbf6.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 34c8389ebb..d19c7960a6 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -565,7 +565,7 @@ static zend_always_inline size_t calculate_unit_length(pcre_cache_entry *pce, ch /* {{{ pcre_get_compiled_regex_cache */ -PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) +PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, int locale_aware) { pcre2_code *re = NULL; uint32_t coptions = 0; @@ -587,7 +587,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) zend_string *key; pcre_cache_entry *ret; - if (BG(locale_string) && + if (locale_aware && BG(locale_string) && (ZSTR_LEN(BG(locale_string)) != 1 && ZSTR_VAL(BG(locale_string))[0] != 'C')) { key = zend_string_alloc(ZSTR_LEN(regex) + ZSTR_LEN(BG(locale_string)) + 1, 0); memcpy(ZSTR_VAL(key), ZSTR_VAL(BG(locale_string)), ZSTR_LEN(BG(locale_string)) + 1); @@ -879,6 +879,14 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) } /* }}} */ +/* {{{ pcre_get_compiled_regex_cache + */ +PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) +{ + return pcre_get_compiled_regex_cache_ex(regex, 1); +} +/* }}} */ + /* {{{ pcre_get_compiled_regex */ PHPAPI pcre2_code *pcre_get_compiled_regex(zend_string *regex, uint32_t *capture_count) |