[pull] master from php:master

NEWS

@@ -23,9 +23,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-20426 (Spoofchecker::setRestrictionLevel() error message
     suggests missing constants). (DanielEScherzer)
 
-- Mbstring
-  . Fixed bug GH-20674 (Fix GH-20674 mb_decode_mimeheader does not handle
-    separator). (Yuya Hamada)
+- JSON:
+  . Enriched JSON last error / exception message with error location.
+    (Juan Morales)
 
 - Fibers:
   . Fixed bug GH-20483 (ASAN stack overflow with fiber.stack_size INI
@@ -35,8 +35,6 @@ PHP                                                                        NEWS
   . ini_set() with mbstring.detect_order changes the order of mb_detect_order
     as intended, since mbstring.detect_order is an INI_ALL setting. (tobee94)
   . Added GB18030-2022 to default encoding list for zh-CN. (HeRaNO)
-  . Fixed bug GH-20674 (Fix GH-20674 mb_decode_mimeheader does not handle
-    separator). (Yuya Hamada)
 
 - Opcache:
   . Fixed bug GH-20051 (apache2 shutdowns when restart is requested during

UPGRADING

@@ -40,6 +40,10 @@ PHP 8.6 UPGRADE NOTES
     IntlNumberRangeFormatter::IDENTITY_FALLBACK_RANGE identity fallbacks.
     It is supported from icu 63.
 
+- JSON:
+  . Added extra info about error location to the JSON error messages returned
+    from json_last_error_msg() and JsonException message.
+
 - Phar:
   . Overriding the getMTime() and getPathname() methods of SplFileInfo now
     influences the result of the phar buildFrom family of functions.

ext/curl/curl.stub.php

@@ -3133,7 +3133,7 @@
  */
 const CURLOPT_TLS13_CIPHERS = UNKNOWN;
 
-#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
+#if LIBCURL_VERSION_NUM >= 0x073e00 /* Available since 7.62.0 */
 /**
  * @var int
  * @cvalue CURLOPT_DOH_URL
@@ -3769,7 +3769,7 @@ function curl_getinfo(CurlHandle $handle, ?int $option = null): mixed {}
 /** @refcount 1 */
 function curl_init(?string $url = null): CurlHandle|false {}
 
-#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
+#if LIBCURL_VERSION_NUM >= 0x073e00 /* Available since 7.62.0 */
 function curl_upkeep(CurlHandle $handle): bool {}
 #endif