diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-09-05 00:38:57 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-09-05 00:38:57 -0700 |
| commit | 92db92c6201c5912e151b2de507c305dc6296efe (patch) | |
| tree | 3b440a8c149dd412ac417b18da683c93cff1719d /ext/pcre/php_pcre.c | |
| parent | b5f9427ca95a11d809f04c67d2a3446e3cb4df95 (diff) | |
| parent | 39423e425d6caafea3c0b45c2b6ebe4a06a11462 (diff) | |
| download | php-git-92db92c6201c5912e151b2de507c305dc6296efe.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
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 1ff8ae4654..2ae5b98cd6 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; |