diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-09-05 00:39:01 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-09-05 00:39:01 -0700 |
| commit | 9650b8e2412a919df8c5c626a1def937bc6d77d5 (patch) | |
| tree | c1e3c8785e637e00200f5daa1c0d3fb098d6dbe9 /ext/pcre/php_pcre.c | |
| parent | f57c059b96f9ca2344e47d3b78385d076058951e (diff) | |
| parent | 92db92c6201c5912e151b2de507c305dc6296efe (diff) | |
| download | php-git-9650b8e2412a919df8c5c626a1def937bc6d77d5.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Implement #47456: Missing PCRE option 'J'
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index e10da07ea8..740311d192 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -431,6 +431,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) coptions |= PCRE_UCP; #endif break; + case 'J': coptions |= PCRE_DUPNAMES; break; /* Custom preg options */ case 'e': poptions |= PREG_REPLACE_EVAL; break; |