Skip to content

Commit f01a345

Browse files
committed
Remove charsets plugin
1 parent e60f880 commit f01a345

3 files changed

Lines changed: 1 addition & 48 deletions

File tree

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
@@ -969,40 +969,6 @@ PHPAPI zend_ulong mysqlnd_cset_escape_slashes(const MYSQLND_CHARSET * const cset
969969
/* }}} */
970970

971971

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

ext/mysqlnd/mysqlnd_charset.h

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

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

0 commit comments

Comments
 (0)