diff options
| author | Anatol Belski <ab@php.net> | 2018-06-06 11:14:15 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-06-06 11:14:15 +0200 |
| commit | 0bafb530d639d5fca5d6ed95b5266625b66f2cdf (patch) | |
| tree | 7d6cd8ce71977f7f39c74ca4b33b91332e9f3cdc /ext/mysqlnd/mysqlnd_wireprotocol.h | |
| parent | 917222f3954e19a04ac311b60bfa1ee121ae81f4 (diff) | |
| parent | f96df64cb2219fda42ca875483f874cf3052647c (diff) | |
| download | php-git-0bafb530d639d5fca5d6ed95b5266625b66f2cdf.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix VC compilation as variable size array is not supported
Fix MySQL 8 auth
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index d6855580b4..c749afeb75 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -292,6 +292,16 @@ typedef struct st_mysqlnd_packet_sha256_pk_request_response { size_t public_key_len; } MYSQLND_PACKET_SHA256_PK_REQUEST_RESPONSE; +typedef struct st_mysqlnd_packet_cached_sha2_result { + MYSQLND_PACKET_HEADER header; + uint8_t response_code; + uint8_t result; + uint8_t request; + zend_uchar * password; + size_t password_len; +} MYSQLND_PACKET_CACHED_SHA2_RESULT; + + zend_ulong php_mysqlnd_net_field_length(const zend_uchar **packet); zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, const uint64_t length); |