Commit 91b0aebae7a for php.net
commit 91b0aebae7ad16c7e0cc71deb0effe02e10d751a
Author: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon Apr 13 15:01:56 2026 +0100
Remove charsets plugin (#21714)
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 5da8d205be7..3a24fcce477 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -133,6 +133,7 @@ PHP 8.6 INTERNALS UPGRADE NOTES
. Dropped session_options parameter from all methods in mysqlnd_auth.
The same information is present in conn->options and should be used
instead.
+ . Removed charsets plugin.
- ext/session:
. php_session_flush() now returns a bool rather than a zend_result.
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
index b9ba0577c84..eacf74240fd 100644
--- a/ext/mysqlnd/mysqlnd_charset.c
+++ b/ext/mysqlnd/mysqlnd_charset.c
@@ -967,40 +967,6 @@ PHPAPI zend_ulong mysqlnd_cset_escape_slashes(const MYSQLND_CHARSET * const cset
/* }}} */
-static struct st_mysqlnd_plugin_charsets mysqlnd_plugin_charsets_plugin =
-{
- {
- MYSQLND_PLUGIN_API_VERSION,
- "charsets",
- MYSQLND_VERSION_ID,
- PHP_MYSQLND_VERSION,
- "Modified BSD License (BSD-3-Clause)",
- "Andrey Hristov <andrey@php.net>, Ulf Wendel <uw@php.net>, Georg Richter <georg@php.net>",
- {
- NULL, /* no statistics , will be filled later if there are some */
- NULL, /* no statistics */
- },
- {
- NULL /* plugin shutdown */
- }
- },
- {/* methods */
- mysqlnd_find_charset_nr,
- mysqlnd_find_charset_name,
- mysqlnd_cset_escape_quotes,
- mysqlnd_cset_escape_slashes
- }
-};
-
-
-/* {{{ mysqlnd_charsets_plugin_register */
-void
-mysqlnd_charsets_plugin_register(void)
-{
- mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_plugin_charsets_plugin);
-}
-/* }}} */
-
#if MYSQLND_CHARSETS_SANITY_CHECK
void mysqlnd_charsets_sanity_check(void)
{
diff --git a/ext/mysqlnd/mysqlnd_charset.h b/ext/mysqlnd/mysqlnd_charset.h
index 401d6d98cec..d5e621e38eb 100644
--- a/ext/mysqlnd/mysqlnd_charset.h
+++ b/ext/mysqlnd/mysqlnd_charset.h
@@ -26,18 +26,4 @@ PHPAPI zend_ulong mysqlnd_cset_escape_quotes(const MYSQLND_CHARSET * const chars
PHPAPI zend_ulong mysqlnd_cset_escape_slashes(const MYSQLND_CHARSET * const cset, char * newstr,
const char * escapestr, const size_t escapestr_len);
-struct st_mysqlnd_plugin_charsets
-{
- const struct st_mysqlnd_plugin_header plugin_header;
- struct
- {
- const MYSQLND_CHARSET * (*const find_charset_by_nr)(unsigned int charsetnr);
- const MYSQLND_CHARSET * (*const find_charset_by_name)(const char * const name);
- zend_ulong (*const escape_quotes)(const MYSQLND_CHARSET * const cset, char * newstr, const char * escapestr, const size_t escapestr_len);
- zend_ulong (*const escape_slashes)(const MYSQLND_CHARSET * const cset, char * newstr, const char * escapestr, const size_t escapestr_len);
- } methods;
-};
-
-void mysqlnd_charsets_plugin_register(void);
-
#endif /* MYSQLND_CHARSET_H */