From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 18 Mar 2021 09:50:57 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4dce2f83f5c7d13c28a95d45dd6d905504474774;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix locale switch back to C in pcre
---

4dce2f83f5c7d13c28a95d45dd6d905504474774
diff --cc ext/pcre/php_pcre.c
index 60d0670213,7b38ac43d7..f4f99432fd
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@@ -790,9 -767,14 +790,9 @@@ PHPAPI pcre_cache_entry* pcre_get_compi
  			zend_hash_add_ptr(&char_tables, _k, (void *)tables);
  			zend_string_release(_k);
  		}
- 		pcre2_set_character_tables(cctx, tables);
  	}
+ 	pcre2_set_character_tables(cctx, tables);
  
 -	/* Set extra options for the compile context. */
 -	if (PHP_PCRE_DEFAULT_EXTRA_COPTIONS != extra_coptions) {
 -		pcre2_set_compile_extra_options(cctx, extra_coptions);
 -	}
 -
  	/* Compile pattern and display a warning if compilation failed. */
  	re = pcre2_compile((PCRE2_SPTR)pattern, pattern_len, coptions, &errnumber, &erroffset, cctx);