Merge branch 'PHP-8.5'

TimWolla · TimWolla · commit 45a819dcf1b4 · 2025-11-17T19:29:48.000+01:00
* PHP-8.5:
  lexbor: Cherry pick "URL: the cloning function does not copy the type for IPv4 and IPv6."
diff --git a/ext/lexbor/lexbor/url/url.c b/ext/lexbor/lexbor/url/url.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Alexander Borisov
+ * Copyright (C) 2023-2025 Alexander Borisov
  *
  * Author: Alexander Borisov <borisov@lexbor.com>
  */
@@ -1106,9 +1106,9 @@ lxb_url_host_copy(const lxb_url_host_t *src, lxb_url_host_t *dst,
         }
     }
 
-    if (src->type <= LXB_URL_HOST_TYPE_OPAQUE) {
-        dst->type = src->type;
+    dst->type = src->type;
 
+    if (src->type <= LXB_URL_HOST_TYPE_OPAQUE) {
         if (src->type == LXB_URL_HOST_TYPE__UNDEF) {
             return LXB_STATUS_OK;
         }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2023-2024 Alexander Borisov`
	`2`	`+ * Copyright (C) 2023-2025 Alexander Borisov`
`3`	`3`	`*`
`4`	`4`	`* Author: Alexander Borisov <[email protected]>`
`5`	`5`	`*/`
`@@ -1106,9 +1106,9 @@ lxb_url_host_copy(const lxb_url_host_t src, lxb_url_host_t dst,`
`1106`	`1106`	`}`
`1107`	`1107`	`}`
`1108`	`1108`
`1109`		`- if (src->type <= LXB_URL_HOST_TYPE_OPAQUE) {`
`1110`		`- dst->type = src->type;`
	`1109`	`+ dst->type = src->type;`
`1111`	`1110`
	`1111`	`+ if (src->type <= LXB_URL_HOST_TYPE_OPAQUE) {`
`1112`	`1112`	`if (src->type == LXB_URL_HOST_TYPE__UNDEF) {`
`1113`	`1113`	`return LXB_STATUS_OK;`
`1114`	`1114`	`}`