Commit 7516b7e0ab3 for php

commit 7516b7e0ab3de6656880d9abd712d878ee95ef55
Merge: 57153aab55b f6ca007e52c
Author: Jorg Sowa <jorg.sowa@gmail.com>
Date:   Sat Nov 14 17:03:53 2026 +0100

    Merge branch 'PHP-8.4' into PHP-8.5

    # Conflicts:
    #       NEWS
    #       ext/pcre/php_pcre.c

diff --cc NEWS
index 221ffae64a2,a5fa9c4ead9..94255c2958a
--- a/NEWS
+++ b/NEWS
@@@ -80,6 -82,14 +80,10 @@@ PH
    . Fixed stack buffer overflow with long connection user names, passwords,
      charsets, or roles. (Ilia Alshanetsky)

+ - PCRE:
+   . Fixed \C being allowed in patterns enabling UTF mode with (*UTF) instead
+     of the u modifier. (Jorg Sowa)
+
 -- SNMP:
 -  . Fixed use-after-free of the context name set by SNMP::setSecurity().
 -    (lacatoire)
 -
  - SOAP:
    . Fixed bug GH-25267 (NULL dereference in to_xml_any() with integer key).
      (lazerg)
diff --cc ext/pcre/php_pcre.c
index 090cfd8da9a,d5cec133878..208c53d2b5a
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@@ -581,7 -590,9 +581,9 @@@ PHPAPI pcre_cache_entry* pcre_get_compi
  #else
  	uint32_t			 coptions = 0;
  #endif
 -	uint32_t			 eoptions = PHP_PCRE_DEFAULT_EXTRA_COPTIONS;
 +	uint32_t			 eoptions = 0;
+ 	uint32_t			 all_options;
+ 	uint32_t			 has_backslash_c;
  	PCRE2_UCHAR	         error[128];
  	PCRE2_SIZE           erroffset;
  	int                  errnumber;