Commit 13b89e20cb0 for php

commit 13b89e20cb041467b3b194b02f8c676a82f5dacb
Merge: 24ca066b464 94eb5660c32
Author: T <t@e.c>
Date:   Fri Nov 6 11:50:26 2026 +0900

    Merge branch 'PHP-8.5' into PHP-8.6

diff --cc NEWS
index a25df1bb1ca,29bb88d40ec..b6b9a44d43f
--- a/NEWS
+++ b/NEWS
@@@ -12,10 -12,11 +12,14 @@@ PH
  - Curl:
    . Fixed curl_reset() retaining CURLOPT_PRIVATE after reset. (lacatoire)

+ - MBString:
+   . Fixed stack overflow in mb_check_encoding() and mb_convert_encoding() with
+     deeply nested arrays. (Eyüp Can Akman)
+
  - Opcache:
 +  . Fixed bug GH-22216 (spurious opcache.memory_consumption warning on each new
 +    ZTS thread; the directive is also reported as 0 in worker threads).
 +    (Daisuke Komazaki)
    . Fixed bug GH-25165 (Tracing JIT loops forever once opcache.jit_buffer_size
      is exhausted while compiling side traces). (Ilia Alshanetsky)
    . Fixed bug GH-25164 (Function JIT loop calling a user function runs once
diff --cc ext/mbstring/mbstring.c
index eb05a098677,7e162edcdff..d2e17d6c0bc
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@@ -5721,6 -5693,12 +5734,10 @@@ static bool php_mb_check_encoding_recur
  	zval *entry;
  	bool valid = true;

 -	(void)(idx); /* Suppress spurious compiler warning that `idx` is not used */
 -
+ 	if (mb_check_stack_limit()) {
+ 		return false;
+ 	}
+
  	if (GC_IS_RECURSIVE(vars)) {
  		php_error_docref(NULL, E_WARNING, "Cannot not handle circular references");
  		return false;