Skip to content

Commit 91b0aeb

Browse files
Remove charsets plugin (#21714)
1 parent b34d906 commit 91b0aeb

File tree

3 files changed

+1
-48
lines changed

3 files changed

+1
-48
lines changed

UPGRADING.INTERNALS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ PHP 8.6 INTERNALS UPGRADE NOTES
133133
. Dropped session_options parameter from all methods in mysqlnd_auth.
134134
The same information is present in conn->options and should be used
135135
instead.
136+
. Removed charsets plugin.
136137

137138
- ext/session:
138139
. php_session_flush() now returns a bool rather than a zend_result.

ext/mysqlnd/mysqlnd_charset.c

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -967,40 +967,6 @@ PHPAPI zend_ulong mysqlnd_cset_escape_slashes(const MYSQLND_CHARSET * const cset
967967
/* }}} */
968968

969969

970-
static struct st_mysqlnd_plugin_charsets mysqlnd_plugin_charsets_plugin =
971-
{
972-
{
973-
MYSQLND_PLUGIN_API_VERSION,
974-
"charsets",
975-
MYSQLND_VERSION_ID,
976-
PHP_MYSQLND_VERSION,
977-
"Modified BSD License (BSD-3-Clause)",
978-
"Andrey Hristov <andrey@php.net>, Ulf Wendel <uw@php.net>, Georg Richter <georg@php.net>",
979-
{
980-
NULL, /* no statistics , will be filled later if there are some */
981-
NULL, /* no statistics */
982-
},
983-
{
984-
NULL /* plugin shutdown */
985-
}
986-
},
987-
{/* methods */
988-
mysqlnd_find_charset_nr,
989-
mysqlnd_find_charset_name,
990-
mysqlnd_cset_escape_quotes,
991-
mysqlnd_cset_escape_slashes
992-
}
993-
};
994-
995-
996-
/* {{{ mysqlnd_charsets_plugin_register */
997-
void
998-
mysqlnd_charsets_plugin_register(void)
999-
{
1000-
mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_plugin_charsets_plugin);
1001-
}
1002-
/* }}} */
1003-
1004970
#if MYSQLND_CHARSETS_SANITY_CHECK
1005971
void mysqlnd_charsets_sanity_check(void)
1006972
{

ext/mysqlnd/mysqlnd_charset.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,4 @@ PHPAPI zend_ulong mysqlnd_cset_escape_quotes(const MYSQLND_CHARSET * const chars
2626
PHPAPI zend_ulong mysqlnd_cset_escape_slashes(const MYSQLND_CHARSET * const cset, char * newstr,
2727
const char * escapestr, const size_t escapestr_len);
2828

29-
struct st_mysqlnd_plugin_charsets
30-
{
31-
const struct st_mysqlnd_plugin_header plugin_header;
32-
struct
33-
{
34-
const MYSQLND_CHARSET * (*const find_charset_by_nr)(unsigned int charsetnr);
35-
const MYSQLND_CHARSET * (*const find_charset_by_name)(const char * const name);
36-
zend_ulong (*const escape_quotes)(const MYSQLND_CHARSET * const cset, char * newstr, const char * escapestr, const size_t escapestr_len);
37-
zend_ulong (*const escape_slashes)(const MYSQLND_CHARSET * const cset, char * newstr, const char * escapestr, const size_t escapestr_len);
38-
} methods;
39-
};
40-
41-
void mysqlnd_charsets_plugin_register(void);
42-
4329
#endif /* MYSQLND_CHARSET_H */

0 commit comments

Comments
 (0)