Merge branch 'PHP-7.4' into PHP-8.0

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

diff --cc ext/pcre/php_pcre.c
index 60d067021303f1b4e1c07b764ce28fc3261d9f1a,7b38ac43d749ebc292ee34d630b731192e95ad2e..f4f99432fdbe5a81f3de9cfb5bcbe19b33f1f6c1
--- 1/ext/pcre/php_pcre.c
--- 2/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);