Merge branch 'master' into clone-function

Author: TimWolla

NEWS

@@ -58,6 +58,7 @@ PHP                                                                        NEWS
   . Added the pipe (|>) operator. (crell)
   . Added support for `final` with constructor property promotion.
     (DanielEScherzer)
+  . Do not use RTLD_DEEPBIND if dlmopen is available. (Daniil Gentili)
 
 - Curl:
   . Added curl_multi_get_handles(). (timwolla)
@@ -260,6 +261,10 @@ PHP                                                                        NEWS
   . Added array_first() and array_last(). (nielsdos)
   . Fixed bug GH-18823 (setlocale's 2nd and 3rd argument ignores strict_types).
     (nielsdos)
+  . Fixed exit code handling of sendmail cmd and added warnings.
+    (Jesse Hathaway)
+  . Fixed bug GH-18897 (printf: empty precision is interpreted as precision 6,
+    not as precision 0). (nielsdos)
 
 - Streams:
   . Fixed bug GH-16889 (stream_select() timeout useless for pipes on Windows).

UPGRADING

@@ -116,6 +116,11 @@ PHP 8.5 UPGRADE NOTES
   . SplFileObject::fwrite's parameter $length is now nullable. The default
     value changed from 0 to null.
 
+- Standard:
+  . Using a printf-family function with a formatter that did not specify the
+    precision previously incorrectly reset the precision instead of treating
+    it as a precision of 0. See GH-18897.
+
 ========================================
 2. New Features
 ========================================
@@ -217,6 +222,12 @@ PHP 8.5 UPGRADE NOTES
     Sqlite3Stmt::EXPLAIN_MODE_EXPLAIN and
     Sqlite3Stmt::EXPLAIN_MODE_EXPLAIN_QUERY_PLAN.
 
+- Standard:
+  . mail() now returns the actual sendmail error and detects if the sendmail
+    process was terminated unexpectedly. In such cases, a warning is emitted
+    and the function returns false. Previously, these errors were silently
+    ignored. This change affects only the sendmail transport.
+
 - XSL:
   . The $namespace argument of XSLTProcessor::getParameter(),
     XSLTProcessor::setParameter() and XSLTProcessor::removeParameter()

UPGRADING.INTERNALS

@@ -17,6 +17,12 @@ PHP 8.5 INTERNALS UPGRADE NOTES
 - Core
   . PG(arg_separator).input and PG(arg_separator).output are now `zend_string*`
     instead of `char*`.
+  . DL_LOAD now doesn't use RTLD_DEEPBIND deepbind anymore on platforms
+    where dlmopen with LM_ID_NEWLM is available:
+    this means shared library symbol isolation (if needed) must be enabled on
+    the user side when requiring libphp.so, by using dlmopen with LM_ID_NEWLM
+    instead of dlopen.
+    RTLD_DEEPBIND is still enabled when the Apache SAPI is in use.
 
 - Zend
   . Added zend_safe_assign_to_variable_noref() function to safely assign
@@ -37,6 +43,8 @@ PHP 8.5 INTERNALS UPGRADE NOTES
   . Added the zend_update_exception_properties() function for instantiating
     Exception child classes. It updates the $message, $code, and $previous
     properties.
+  . ZEND_IS_XDIGIT() macro was removed because it was unused and its name
+    did not match its actual behavior.
 
 ========================
 2. Build system changes
@@ -49,12 +57,18 @@ PHP 8.5 INTERNALS UPGRADE NOTES
     without duplicate build rules.  It is up to the SAPI maintainers to ensure
     that appropriate build rules are created.
 
-- Linux build system changes
+- Unix build system changes
   . libdir is properly set when --libdir (ex: /usr/lib64) and --with-libdir (ex lib64)
     configure options are used to ${libdir}/php (ex: /usr/lib64/php)
   . PHP_ODBC_CFLAGS, PHP_ODBC_LFLAGS, PHP_ODBC_LIBS, PHP_ODBC_TYPE preprocessor
     macros defined by ext/odbc are now defined in php_config.h instead of the
     build-defs.h header.
+  . Autoconf macro PHP_AP_EXTRACT_VERSION has been removed.
+  . Autoconf macro PHP_BUILD_THREAD_SAFE has been removed (set enable_zts
+    manually).
+  . Autoconf macro PHP_DEF_HAVE has been removed (use AC_DEFINE).
+  . Autoconf macro PHP_OUTPUT has been removed (use AC_CONFIG_FILES).
+  . Autoconf macro PHP_TEST_BUILD has been removed (use AC_* macros).
 
 ========================
 3. Module changes

Zend/tests/gh18907.phpt

@@ -0,0 +1,26 @@
+--TEST--
+GH-18907: Leak when creating cycle inside hook
+--FILE--
+<?php
+
+class Foo {
+    public $prop {
+        get {
+            $this->prop = $this;
+            return 1;
+        }
+    }
+}
+
+function test() {
+    var_dump((new Foo)->prop);
+}
+
+/* Call twice to test the ZEND_IS_PROPERTY_HOOK_SIMPLE_GET() path. */
+test();
+test();
+
+?>
+--EXPECT--
+int(1)
+int(1)

Zend/zend_API.c

@@ -40,13 +40,20 @@
 /* these variables are true statics/globals, and have to be mutex'ed on every access */
 ZEND_API HashTable module_registry;
 
+ZEND_API bool zend_dl_use_deepbind = false;
+
 static zend_module_entry **module_request_startup_handlers;
 static zend_module_entry **module_request_shutdown_handlers;
 static zend_module_entry **module_post_deactivate_handlers;
 static zend_module_entry **modules_dl_loaded;
 
 static zend_class_entry  **class_cleanup_handlers;
 
+ZEND_API void zend_set_dl_use_deepbind(bool use_deepbind)
+{
+	zend_dl_use_deepbind = use_deepbind;
+}
+
 ZEND_API zend_result zend_get_parameters_array_ex(uint32_t param_count, zval *argument_array) /* {{{ */
 {
 	zval *param_ptr;

Zend/zend_API.h

@@ -343,6 +343,8 @@ typedef struct _zend_fcall_info_cache {
 ZEND_API int zend_next_free_module(void);
 
 BEGIN_EXTERN_C()
+ZEND_API void zend_set_dl_use_deepbind(bool use_deepbind);
+
 ZEND_API zend_result zend_get_parameters_array_ex(uint32_t param_count, zval *argument_array);
 
 /* internal function to efficiently copy parameters when executing __call() */

Zend/zend_object_handlers.c

@@ -722,7 +722,9 @@ static bool zend_call_get_hook(
 		return false;
 	}
 
+	GC_ADDREF(zobj);
 	zend_call_known_instance_method_with_0_params(get, zobj, rv);
+	OBJ_RELEASE(zobj);
 
 	return true;
 }

Zend/zend_operators.h

@@ -156,7 +156,6 @@ static zend_always_inline zend_long zend_dval_to_lval_safe(double d)
 }
 
 #define ZEND_IS_DIGIT(c) ((c) >= '0' && (c) <= '9')
-#define ZEND_IS_XDIGIT(c) (((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f'))
 
 static zend_always_inline uint8_t is_numeric_string_ex(const char *str, size_t length, zend_long *lval,
 	double *dval, bool allow_errors, int *oflow_info, bool *trailing_data)

Zend/zend_portability.h

@@ -165,7 +165,12 @@
 # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
 #  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
 # elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) && !__has_feature(memory_sanitizer)
-#  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_DEEPBIND)
+#  if defined(LM_ID_NEWLM)
+     ZEND_API extern bool zend_dl_use_deepbind;
+#    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | (zend_dl_use_deepbind ? RTLD_DEEPBIND : 0))
+#  else
+#    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_DEEPBIND)
+#  endif
 # else
 #  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL)
 # endif

Zend/zend_string.c

@@ -86,8 +86,6 @@ static zend_always_inline void zend_init_interned_strings_ht(HashTable *interned
 ZEND_API void zend_interned_strings_init(void)
 {
 	char s[2];
-	unsigned int i;
-	zend_string *str;
 
 	interned_string_request_handler = zend_new_interned_string_request;
 	interned_string_init_request_handler = zend_string_init_interned_request;
@@ -103,25 +101,22 @@ ZEND_API void zend_interned_strings_init(void)
 	zend_string_init_existing_interned = zend_string_init_existing_interned_permanent;
 
 	/* interned empty string */
-	str = zend_string_alloc(sizeof("")-1, 1);
-	ZSTR_VAL(str)[0] = '\000';
-	zend_empty_string = zend_new_interned_string_permanent(str);
+	zend_empty_string = zend_string_init_interned_permanent("", 0, true);
 	GC_ADD_FLAGS(zend_empty_string, IS_STR_VALID_UTF8);
 
 	s[1] = 0;
-	for (i = 0; i < 256; i++) {
+	for (size_t i = 0; i < 256; i++) {
 		s[0] = i;
-		zend_one_char_string[i] = zend_new_interned_string_permanent(zend_string_init(s, 1, 1));
+		zend_one_char_string[i] = zend_string_init_interned_permanent(s, 1, true);
 		if (i < 0x80) {
 			GC_ADD_FLAGS(zend_one_char_string[i], IS_STR_VALID_UTF8);
 		}
 	}
 
 	/* known strings */
 	zend_known_strings = pemalloc(sizeof(zend_string*) * ((sizeof(known_strings) / sizeof(known_strings[0]) - 1)), 1);
-	for (i = 0; i < (sizeof(known_strings) / sizeof(known_strings[0])) - 1; i++) {
-		str = zend_string_init(known_strings[i], strlen(known_strings[i]), 1);
-		zend_known_strings[i] = zend_new_interned_string_permanent(str);
+	for (size_t i = 0; i < (sizeof(known_strings) / sizeof(known_strings[0])) - 1; i++) {
+		zend_known_strings[i] = zend_string_init_interned_permanent(known_strings[i], strlen(known_strings[i]), true);
 		GC_ADD_FLAGS(zend_known_strings[i], IS_STR_VALID_UTF8);
 	}
 }