diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-04 05:57:07 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-04 05:57:07 +0200 |
commit | 63072e9c0ebbb676cd39d0f867d873737c676add (patch) | |
tree | 1647ba13a192cd56d95dcf298441bf36c46ed7c4 /ext/mysqlnd/mysqlnd_structs.h | |
parent | 4cbabb6852d2a7d966fb78a53d9d4c1cac18f10b (diff) | |
parent | edec566d9b431259e8cd7a6cb1737d32234e1c6e (diff) | |
download | php-git-63072e9c0ebbb676cd39d0f867d873737c676add.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'ext/mysqlnd/mysqlnd_structs.h')
-rw-r--r-- | ext/mysqlnd/mysqlnd_structs.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 858b662008..a7c892b48d 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -963,7 +963,6 @@ struct st_mysqlnd_packet_chg_user_resp; struct st_mysqlnd_packet_auth_pam; struct st_mysqlnd_packet_sha256_pk_request; struct st_mysqlnd_packet_sha256_pk_request_response; -struct st_mysqlnd_packet_cached_sha2_result; typedef void (*func_mysqlnd_protocol_payload_decoder_factory__init_greet_packet)(struct st_mysqlnd_packet_greet *packet); typedef void (*func_mysqlnd_protocol_payload_decoder_factory__init_auth_packet)(struct st_mysqlnd_packet_auth *packet); @@ -980,7 +979,6 @@ typedef void (*func_mysqlnd_protocol_payload_decoder_factory__init_prepare_respo typedef void (*func_mysqlnd_protocol_payload_decoder_factory__init_change_user_response_packet)(struct st_mysqlnd_packet_chg_user_resp *packet); typedef void (*func_mysqlnd_protocol_payload_decoder_factory__init_sha256_pk_request_packet)(struct st_mysqlnd_packet_sha256_pk_request *packet); typedef void (*func_mysqlnd_protocol_payload_decoder_factory__init_sha256_pk_request_response_packet)(struct st_mysqlnd_packet_sha256_pk_request_response *packet); -typedef void (*func_mysqlnd_protocol_payload_decoder_factory__init_cached_sha2_result_packet)(struct st_mysqlnd_packet_cached_sha2_result *packet); typedef enum_func_status (*func_mysqlnd_protocol_payload_decoder_factory__send_command)( MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * payload_decoder_factory, @@ -1036,7 +1034,6 @@ MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_payload_decoder_factory) func_mysqlnd_protocol_payload_decoder_factory__init_change_user_response_packet init_change_user_response_packet; func_mysqlnd_protocol_payload_decoder_factory__init_sha256_pk_request_packet init_sha256_pk_request_packet; func_mysqlnd_protocol_payload_decoder_factory__init_sha256_pk_request_response_packet init_sha256_pk_request_response_packet; - func_mysqlnd_protocol_payload_decoder_factory__init_cached_sha2_result_packet init_cached_sha2_result_packet; func_mysqlnd_protocol_payload_decoder_factory__send_command send_command; func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response; @@ -1334,18 +1331,11 @@ typedef zend_uchar * (*func_auth_plugin__get_auth_data)(struct st_mysqlnd_authen const MYSQLND_PFC_DATA * const pfc_data, zend_ulong mysql_flags ); -typedef void (*func_auth_plugin__handle_server_response)(struct st_mysqlnd_authentication_plugin * self, - MYSQLND_CONN_DATA * conn, - const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, - const char * const passwd, - const size_t passwd_len); - struct st_mysqlnd_authentication_plugin { struct st_mysqlnd_plugin_header plugin_header; struct { func_auth_plugin__get_auth_data get_auth_data; - func_auth_plugin__handle_server_response handle_server_response; } methods; }; |