Merge branch 'php:master' into power-division-by-zero-deprecation

Author: jorgsowa

UPGRADING

@@ -41,6 +41,9 @@ PHP 8.4 UPGRADE NOTES
     DOMException now. This situation is extremely unlikely though and probably
     will not affect you. As a result DOMImplementation::createDocument() now has
     a tentative return type of DOMDocument instead of DOMDocument|false.
+  . Previously, DOMXPath objects could be cloned, but resulted in an unusable
+    object. This is no longer possible, and cloning a DOMXPath object now throws
+    an error.
 
 - MBString:
   . mb_encode_numericentity() and mb_decode_numericentity() now check that

UPGRADING.INTERNALS

@@ -37,6 +37,9 @@ PHP 8.4 INTERNALS UPGRADE NOTES
 * The zend_*printf family of functions now supports the "%S" modifier to print
   out zend_string*. This won't cut off the string if it embeds a NUL byte.
 
+* The inet_aton() and win32/inet.h on Windows have been removed. Use Windows
+  native inet_pton() from ws2tcpip.h.
+
 ========================
 2. Build system changes
 ========================
@@ -67,6 +70,9 @@ PHP 8.4 INTERNALS UPGRADE NOTES
    - Symbol MISSING_FCLOSE_DECL and M4 macro PHP_MISSING_FCLOSE_DECL removed.
    - Symbol HAVE_BSD_ICONV has been removed.
    - Symbol ZEND_FIBER_ASM has been removed.
+   - Symbols HAVE_DLOPEN and HAVE_DLSYM have been removed.
+   - Symbol HAVE_LIBM has been removed.
+   - Symbol HAVE_INET_ATON has been removed.
    - M4 macro PHP_DEFINE (atomic includes) removed (use AC_DEFINE and config.h).
    - M4 macro PHP_WITH_SHARED has been removed (use PHP_ARG_WITH).
    - M4 macro PHP_STRUCT_FLOCK has been removed (use AC_CHECK_TYPES).

configure.ac

@@ -362,22 +362,16 @@ PHP_CHECK_FUNC(socketpair, socket, network)
 PHP_CHECK_FUNC(htonl, socket, network)
 PHP_CHECK_FUNC(gethostname, nsl, network)
 PHP_CHECK_FUNC(gethostbyaddr, nsl, network)
-PHP_CHECK_FUNC(dlopen, dl)
-PHP_CHECK_FUNC(dlsym, dl)
-if test "$ac_cv_func_dlopen" = "yes"; then
-  AC_DEFINE(HAVE_LIBDL, 1, [ ])
-fi
-AC_CHECK_LIB(m, sin)
+AC_SEARCH_LIBS([dlopen], [dl],
+  [AC_DEFINE([HAVE_LIBDL], [1], [Define to 1 if the dl library is available.])])
+AC_SEARCH_LIBS([sin], [m])
 
 case $host_alias in
   riscv64*)
     PHP_CHECK_FUNC(__atomic_exchange_1, atomic)
     ;;
 esac
 
-dnl Check for inet_aton in -lc and -lresolv.
-PHP_CHECK_FUNC(inet_aton, resolv)
-
 dnl Then headers.
 dnl ----------------------------------------------------------------------------
 

ext/dom/php_dom.c

@@ -872,6 +872,7 @@ PHP_MINIT_FUNCTION(dom)
 	dom_xpath_object_handlers.offset = XtOffsetOf(dom_xpath_object, dom) + XtOffsetOf(dom_object, std);
 	dom_xpath_object_handlers.free_obj = dom_xpath_objects_free_storage;
 	dom_xpath_object_handlers.get_gc = dom_xpath_get_gc;
+	dom_xpath_object_handlers.clone_obj = NULL;
 
 	dom_xpath_class_entry = register_class_DOMXPath();
 	dom_xpath_class_entry->create_object = dom_xpath_objects_new;

ext/dom/tests/DOMXPath_clone.phpt

@@ -0,0 +1,22 @@
+--TEST--
+DOMXPath: Cloning a DOMXPath object
+--EXTENSIONS--
+dom
+--SKIPIF--
+<?php
+if (!class_exists('DOMXPath')) die('skip no xpath support');
+?>
+--FILE--
+<?php
+
+$dom = new DOMDocument;
+$xpath = new DOMXPath($dom);
+try {
+    clone $xpath;
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Trying to clone an uncloneable object of class DOMXPath

ext/dom/tests/DOMXPath_constructor_registered_functions.phpt

@@ -0,0 +1,53 @@
+--TEST--
+DOMXPath: Calling __construct() again when functions were already registered
+--EXTENSIONS--
+dom
+--SKIPIF--
+<?php
+if (!class_exists('DOMXPath')) die('skip no xpath support');
+?>
+--FILE--
+<?php
+
+$dom = new DOMDocument;
+$dom->loadXML('<root/>');
+
+class Test {
+    public function __destruct() {
+        echo "destruct\n";
+    }
+
+    public function test() {
+        echo "test\n";
+    }
+}
+
+echo "=== First run ===\n";
+
+$xpath = new DOMXPath($dom);
+$xpath->registerNamespace('foo', 'urn:foo');
+$xpath->registerPhpFunctionNS('urn:foo', 'test', [new Test, 'test']);
+
+echo "=== Reconstruct ===\n";
+
+$xpath->__construct($dom, true);
+
+echo "=== Second run ===\n";
+
+$xpath->registerNamespace('foo', 'urn:foo');
+$xpath->query('//*[foo:test()]');
+$xpath->registerPhpFunctionNS('urn:foo', 'test', [new Test, 'test']);
+$xpath->query('//*[foo:test()]');
+
+?>
+--EXPECTF--
+=== First run ===
+=== Reconstruct ===
+destruct
+=== Second run ===
+
+Warning: DOMXPath::query(): xmlXPathCompOpEval: function test not found in %s on line %d
+
+Warning: DOMXPath::query(): Unregistered function in %s on line %d
+test
+destruct

ext/dom/xpath.c

@@ -116,45 +116,43 @@ static void dom_xpath_ext_function_trampoline(xmlXPathParserContextPtr ctxt, int
 PHP_METHOD(DOMXPath, __construct)
 {
 	zval *doc;
-	bool register_node_ns = 1;
+	bool register_node_ns = true;
 	xmlDocPtr docp = NULL;
 	dom_object *docobj;
-	dom_xpath_object *intern;
-	xmlXPathContextPtr ctx, oldctx;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|b", &doc, dom_abstract_base_document_class_entry, &register_node_ns) == FAILURE) {
 		RETURN_THROWS();
 	}
 
 	DOM_GET_OBJ(docp, doc, xmlDocPtr, docobj);
 
-	ctx = xmlXPathNewContext(docp);
+	xmlXPathContextPtr ctx = xmlXPathNewContext(docp);
 	if (ctx == NULL) {
 		php_dom_throw_error(INVALID_STATE_ERR, 1);
 		RETURN_THROWS();
 	}
 
-	intern = Z_XPATHOBJ_P(ZEND_THIS);
-	if (intern != NULL) {
-		oldctx = (xmlXPathContextPtr)intern->dom.ptr;
-		if (oldctx != NULL) {
-			php_libxml_decrement_doc_ref((php_libxml_node_object *) &intern->dom);
-			xmlXPathFreeContext(oldctx);
-		}
-
-		xmlXPathRegisterFuncNS (ctx, (const xmlChar *) "functionString",
-					   (const xmlChar *) "http://php.net/xpath",
-					   dom_xpath_ext_function_string_php);
-		xmlXPathRegisterFuncNS (ctx, (const xmlChar *) "function",
-					   (const xmlChar *) "http://php.net/xpath",
-					   dom_xpath_ext_function_object_php);
-
-		intern->dom.ptr = ctx;
-		ctx->userData = (void *)intern;
-		intern->dom.document = docobj->document;
-		intern->register_node_ns = register_node_ns;
-		php_libxml_increment_doc_ref((php_libxml_node_object *) &intern->dom, docp);
+	dom_xpath_object *intern = Z_XPATHOBJ_P(ZEND_THIS);
+	xmlXPathContextPtr oldctx = intern->dom.ptr;
+	if (oldctx != NULL) {
+		php_libxml_decrement_doc_ref((php_libxml_node_object *) &intern->dom);
+		xmlXPathFreeContext(oldctx);
+		php_dom_xpath_callbacks_dtor(&intern->xpath_callbacks);
+		php_dom_xpath_callbacks_ctor(&intern->xpath_callbacks);
 	}
+
+	xmlXPathRegisterFuncNS (ctx, (const xmlChar *) "functionString",
+					(const xmlChar *) "http://php.net/xpath",
+					dom_xpath_ext_function_string_php);
+	xmlXPathRegisterFuncNS (ctx, (const xmlChar *) "function",
+					(const xmlChar *) "http://php.net/xpath",
+					dom_xpath_ext_function_object_php);
+
+	intern->dom.ptr = ctx;
+	ctx->userData = (void *)intern;
+	intern->dom.document = docobj->document;
+	intern->register_node_ns = register_node_ns;
+	php_libxml_increment_doc_ref((php_libxml_node_object *) &intern->dom, docp);
 }
 /* }}} end DOMXPath::__construct */
 
@@ -196,20 +194,16 @@ zend_result dom_xpath_register_node_ns_write(dom_object *obj, zval *newval)
 /* {{{ */
 PHP_METHOD(DOMXPath, registerNamespace)
 {
-	zval *id;
-	xmlXPathContextPtr ctxp;
 	size_t prefix_len, ns_uri_len;
-	dom_xpath_object *intern;
 	unsigned char *prefix, *ns_uri;
 
-	id = ZEND_THIS;
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) {
 		RETURN_THROWS();
 	}
 
-	intern = Z_XPATHOBJ_P(id);
+	dom_xpath_object *intern = Z_XPATHOBJ_P(ZEND_THIS);
 
-	ctxp = (xmlXPathContextPtr) intern->dom.ptr;
+	xmlXPathContextPtr ctxp = intern->dom.ptr;
 	if (ctxp == NULL) {
 		zend_throw_error(NULL, "Invalid XPath Context");
 		RETURN_THROWS();
@@ -233,33 +227,27 @@ static void dom_xpath_iter(zval *baseobj, dom_object *intern) /* {{{ */
 
 static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
 {
-	zval *id, retval, *context = NULL;
-	xmlXPathContextPtr ctxp;
+	zval *context = NULL;
 	xmlNodePtr nodep = NULL;
-	xmlXPathObjectPtr xpathobjp;
 	size_t expr_len, nsnbr = 0, xpath_type;
-	dom_xpath_object *intern;
 	dom_object *nodeobj;
 	char *expr;
-	xmlDoc *docp = NULL;
 	xmlNsPtr *ns = NULL;
-	bool register_node_ns;
 
-	id = ZEND_THIS;
-	intern = Z_XPATHOBJ_P(id);
-	register_node_ns = intern->register_node_ns;
+	dom_xpath_object *intern = Z_XPATHOBJ_P(ZEND_THIS);
+	bool register_node_ns = intern->register_node_ns;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|O!b", &expr, &expr_len, &context, dom_node_class_entry, &register_node_ns) == FAILURE) {
 		RETURN_THROWS();
 	}
 
-	ctxp = (xmlXPathContextPtr) intern->dom.ptr;
+	xmlXPathContextPtr ctxp = intern->dom.ptr;
 	if (ctxp == NULL) {
 		zend_throw_error(NULL, "Invalid XPath Context");
 		RETURN_THROWS();
 	}
 
-	docp = (xmlDocPtr) ctxp->doc;
+	xmlDocPtr docp = ctxp->doc;
 	if (docp == NULL) {
 		php_error_docref(NULL, E_WARNING, "Invalid XPath Document Pointer");
 		RETURN_FALSE;
@@ -285,15 +273,16 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
 		ns = xmlGetNsList(docp, nodep);
 
 		if (ns != NULL) {
-			while (ns[nsnbr] != NULL)
-			nsnbr++;
+			while (ns[nsnbr] != NULL) {
+				nsnbr++;
+			}
 		}
 	}
 
 	ctxp->namespaces = ns;
 	ctxp->nsNr = nsnbr;
 
-	xpathobjp = xmlXPathEvalExpression((xmlChar *) expr, ctxp);
+	xmlXPathObjectPtr xpathobjp = xmlXPathEvalExpression((xmlChar *) expr, ctxp);
 	ctxp->node = NULL;
 
 	if (ns != NULL) {
@@ -317,13 +306,13 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
 
 		case  XPATH_NODESET:
 		{
-			int i;
 			xmlNodeSetPtr nodesetp;
+			zval retval;
 
 			if (xpathobjp->type == XPATH_NODESET && NULL != (nodesetp = xpathobjp->nodesetval) && nodesetp->nodeNr) {
 				array_init_size(&retval, nodesetp->nodeNr);
 				zend_hash_real_init_packed(Z_ARRVAL_P(&retval));
-				for (i = 0; i < nodesetp->nodeNr; i++) {
+				for (int i = 0; i < nodesetp->nodeNr; i++) {
 					xmlNodePtr node = nodesetp->nodeTab[i];
 					zval child;
 

ext/dom/xpath_callbacks.c

@@ -46,6 +46,9 @@ PHP_DOM_EXPORT void php_dom_xpath_callback_ns_dtor(php_dom_xpath_callback_ns *ns
 
 PHP_DOM_EXPORT void php_dom_xpath_callbacks_ctor(php_dom_xpath_callbacks *registry)
 {
+	registry->php_ns = NULL;
+	registry->namespaces = NULL;
+	registry->node_list = NULL;
 }
 
 PHP_DOM_EXPORT void php_dom_xpath_callbacks_clean_node_list(php_dom_xpath_callbacks *registry)

ext/sockets/sockets.c

@@ -30,7 +30,6 @@
 #include "php_ini.h"
 #ifdef PHP_WIN32
 # include "windows_common.h"
-# include <win32/inet.h>
 # include <windows.h>
 # include <Ws2tcpip.h>
 # include "php_sockets.h"

ext/standard/basic_functions.c

@@ -68,8 +68,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 #ifndef PHP_WIN32
 # include <netdb.h>
-#else
-#include "win32/inet.h"
 #endif
 
 #ifdef HAVE_ARPA_INET_H

ext/standard/dns.c

@@ -25,7 +25,6 @@
 #endif
 
 #ifdef PHP_WIN32
-# include "win32/inet.h"
 # include <winsock2.h>
 # include <windows.h>
 # include <Ws2tcpip.h>