Skip to content

Commit aebb124

Browse files
committed
Remove the mysqlnd_reverse_api feature
1 parent 63d8a7f commit aebb124

8 files changed

Lines changed: 0 additions & 129 deletions

File tree

ext/mysqli/mysqli.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,6 @@ PHP_MYSQLI_EXPORT(zend_object *) mysqli_objects_new(zend_class_entry *class_type
393393
}
394394
/* }}} */
395395

396-
#include "ext/mysqlnd/mysqlnd_reverse_api.h"
397-
398396
static PHP_INI_MH(OnUpdateDefaultPort)
399397
{
400398
zend_long value = ZEND_ATOL(ZSTR_VAL(new_value));
@@ -517,8 +515,6 @@ PHP_MINIT_FUNCTION(mysqli)
517515

518516
register_mysqli_symbols(module_number);
519517

520-
mysqlnd_reverse_api_register_api(&mysqli_module_entry);
521-
522518
return SUCCESS;
523519
}
524520
/* }}} */

ext/mysqlnd/config.w32

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ if (PHP_MYSQLND != "no") {
1515
"mysqlnd_driver.c " +
1616
"mysqlnd_ext_plugin.c " +
1717
"mysqlnd_loaddata.c " +
18-
"mysqlnd_reverse_api.c " +
1918
"mysqlnd_plugin.c " +
2019
"mysqlnd_protocol_frame_codec.c " +
2120
"mysqlnd_ps.c " +

ext/mysqlnd/config9.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
5454
mysqlnd_read_buffer.c
5555
mysqlnd_result_meta.c
5656
mysqlnd_result.c
57-
mysqlnd_reverse_api.c
5857
mysqlnd_statistics.c
5958
mysqlnd_vio.c
6059
mysqlnd_wireprotocol.c

ext/mysqlnd/mysqlnd_driver.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "mysqlnd_priv.h"
2525
#include "mysqlnd_statistics.h"
2626
#include "mysqlnd_debug.h"
27-
#include "mysqlnd_reverse_api.h"
2827
#include "mysqlnd_ext_plugin.h"
2928

3029
static bool mysqlnd_library_initted = FALSE;
@@ -57,7 +56,6 @@ PHPAPI void mysqlnd_library_end(void)
5756
mysqlnd_stats_end(mysqlnd_global_stats, 1);
5857
mysqlnd_global_stats = NULL;
5958
mysqlnd_library_initted = FALSE;
60-
mysqlnd_reverse_api_end();
6159
}
6260
}
6361
/* }}} */
@@ -84,8 +82,6 @@ PHPAPI void mysqlnd_library_init(void)
8482
mysqlnd_debug_trace_plugin_register();
8583
mysqlnd_register_builtin_authentication_plugins();
8684

87-
mysqlnd_reverse_api_init();
88-
8985
#if MYSQLND_CHARSETS_SANITY_CHECK == 1
9086
void mysqlnd_charsets_sanity_check(void);
9187
mysqlnd_charsets_sanity_check();

ext/mysqlnd/mysqlnd_reverse_api.c

Lines changed: 0 additions & 60 deletions
This file was deleted.

ext/mysqlnd/mysqlnd_reverse_api.h

Lines changed: 0 additions & 28 deletions
This file was deleted.

ext/mysqlnd/php_mysqlnd.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "mysqlnd_priv.h"
2222
#include "mysqlnd_debug.h"
2323
#include "mysqlnd_statistics.h"
24-
#include "mysqlnd_reverse_api.h"
2524
#include "ext/standard/info.h"
2625
#include "zend_smart_str.h"
2726

@@ -57,23 +56,6 @@ mysqlnd_minfo_dump_loaded_plugins(zval *el, void * buf)
5756
/* }}} */
5857

5958

60-
/* {{{ mysqlnd_minfo_dump_api_plugins */
61-
static void
62-
mysqlnd_minfo_dump_api_plugins(smart_str * buffer)
63-
{
64-
HashTable *ht = mysqlnd_reverse_api_get_api_list();
65-
zend_module_entry * ext;
66-
67-
ZEND_HASH_MAP_FOREACH_PTR(ht, ext) {
68-
if (buffer->s) {
69-
smart_str_appendc(buffer, ',');
70-
}
71-
smart_str_appends(buffer, ext->name);
72-
} ZEND_HASH_FOREACH_END();
73-
}
74-
/* }}} */
75-
76-
7759
/* {{{ PHP_MINFO_FUNCTION */
7860
PHP_MINFO_FUNCTION(mysqlnd)
7961
{
@@ -118,11 +100,6 @@ PHP_MINFO_FUNCTION(mysqlnd)
118100
smart_str_0(&tmp_str);
119101
php_info_print_table_row(2, "Loaded plugins", tmp_str.s? ZSTR_VAL(tmp_str.s) : "");
120102
smart_str_free(&tmp_str);
121-
122-
mysqlnd_minfo_dump_api_plugins(&tmp_str);
123-
smart_str_0(&tmp_str);
124-
php_info_print_table_row(2, "API Extensions", tmp_str.s? ZSTR_VAL(tmp_str.s) : "");
125-
smart_str_free(&tmp_str);
126103
}
127104

128105
php_info_print_table_end();

ext/pdo_mysql/pdo_mysql.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql)
5757
# endif
5858
#endif
5959

60-
#ifdef PDO_USE_MYSQLND
61-
#include "ext/mysqlnd/mysqlnd_reverse_api.h"
62-
#endif
63-
6460
/* Returns the number of SQL warnings during the execution of the last statement */
6561
PHP_METHOD(Pdo_Mysql, getWarningCount)
6662
{
@@ -125,10 +121,6 @@ static PHP_MINIT_FUNCTION(pdo_mysql)
125121
REGISTER_PDO_MYSQL_CLASS_CONST_LONG_DEPRECATED_ALIAS_85("ATTR_LOCAL_INFILE_DIRECTORY", (zend_long)PDO_MYSQL_ATTR_LOCAL_INFILE_DIRECTORY);
126122
#endif
127123

128-
#ifdef PDO_USE_MYSQLND
129-
mysqlnd_reverse_api_register_api(&pdo_mysql_module_entry);
130-
#endif
131-
132124
pdo_mysql_ce = register_class_Pdo_Mysql(pdo_dbh_ce);
133125
pdo_mysql_ce->create_object = pdo_dbh_new;
134126

0 commit comments

Comments
 (0)