[php-src] master: Merge branch 'PHP-8.4' into PHP-8.5
| From: | Ilia Alshanetsky | Date: | Thu, 01 Oct 2026 14:39:29 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.4' into PHP-8.5 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-141835@lists.php.net to get a copy of this message | ||
Author: Ilia Alshanetsky (iliaal)
Date: 2026-10-01T10:16:12-04:00
Commit: https://github.com/php/php-src/commit/2460f3d2988340ef8cd220ec5dcfc211f161fad5
Raw diff: https://github.com/php/php-src/commit/2460f3d2988340ef8cd220ec5dcfc211f161fad5.diff
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
ext/mysqlnd: Fix VIO plugin area getter
Changed paths:
M ext/mysqlnd/mysqlnd_ext_plugin.h
Diff:
diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.h b/ext/mysqlnd/mysqlnd_ext_plugin.h
index 8780ff463045..9c60ea50356d 100644
--- a/ext/mysqlnd/mysqlnd_ext_plugin.h
+++ b/ext/mysqlnd/mysqlnd_ext_plugin.h
@@ -42,7 +42,7 @@ PHPAPI extern struct st_mysqlnd_plugin__plugin_area_getters mysqlnd_plugin_area_
#define mysqlnd_plugin_get_plugin_stmt_data(stmt,
p_id) mysqlnd_plugin_area_getters.get_stmt_area((stmt), (p_id))
#define mysqlnd_plugin_get_plugin_protocol_data(proto,
p_id) mysqlnd_plugin_area_getters.get_protocol_decoder_area((proto), (p_id))
#define mysqlnd_plugin_get_plugin_pfc_data(pfc,
p_id) mysqlnd_plugin_area_getters.get_pfc_area((pfc), (p_id))
-#define mysqlnd_plugin_get_plugin_vio_data(vio,
p_id) mysqlnd_plugin_area_getters.get_pfc_area((vio), (p_id))
+#define mysqlnd_plugin_get_plugin_vio_data(vio,
p_id) mysqlnd_plugin_area_getters.get_vio_area((vio), (p_id))
struct st_mysqlnd_plugin_methods_xetters