diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-27 17:31:27 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-27 17:31:27 +0100 |
| commit | 184f118d3f5d48362989bdc899faca924e75e9a5 (patch) | |
| tree | 883cb1075cce1c6d92933c57b86da81ddc85aa18 /ext/mysqlnd/mysqlnd_wireprotocol.h | |
| parent | 7e130df2497a3410eb8e20be235048cd465bca77 (diff) | |
| parent | 32cd373dfd4e5b5710929c534f960694853a02e0 (diff) | |
| download | php-git-184f118d3f5d48362989bdc899faca924e75e9a5.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Handle empty password fast path in caching_sha2_password
Handle error response during caching_sha2_password auth
Add support for caching_sha2_password in change user authentication
Fix unix socket check during caching_sha2_password
Support auth switch request during caching sha2 auth
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index 72453dcc30..e917736bb5 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -286,6 +286,15 @@ typedef struct st_mysqlnd_packet_cached_sha2_result { uint8_t request; zend_uchar * password; size_t password_len; + /* Used for auth switch request */ + char *new_auth_protocol; + size_t new_auth_protocol_len; + zend_uchar *new_auth_protocol_data; + size_t new_auth_protocol_data_len; + /* Used for error result */ + char error[MYSQLND_ERRMSG_SIZE+1]; + char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; + unsigned int error_no; } MYSQLND_PACKET_CACHED_SHA2_RESULT; |