From 71d16feebbb38f69007d8b7bec44afeb916281fb Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Thu, 21 Jun 2018 19:18:15 +0200 Subject: Fix #76512: \w no longer includes unicode characters The migration from PCRE to PCRE2 missed to rename once occurrence of `PCRE_UCP` to `PCRE2_UCP`. We fix that. We also revert the changes to bug52971.phpt which had been incorrectly made in commit a5bc5ae[1]. [1] --- ext/pcre/php_pcre.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/pcre/php_pcre.c') diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index ffecc39422..9e1a5a6a50 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -672,8 +672,8 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) case 'u': coptions |= PCRE2_UTF; /* In PCRE, by default, \d, \D, \s, \S, \w, and \W recognize only ASCII characters, even in UTF-8 mode. However, this can be changed by setting - the PCRE_UCP option. */ -#ifdef PCRE_UCP + the PCRE2_UCP option. */ +#ifdef PCRE2_UCP coptions |= PCRE2_UCP; #endif break; -- cgit v1.2.1