diff options
| author | Andrey Hristov <andrey@php.net> | 2019-06-21 16:33:01 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2019-06-21 16:33:01 +0300 |
| commit | 1da15600ae145a953b87682a370d940fbe95044a (patch) | |
| tree | 94c657e148a56b355d8ecd106f6548f191a3371a | |
| parent | 021bb35aec685981dfdfd38bbfc109aa7d1d025f (diff) | |
| parent | 8326f95fe3736031dc8776898564d3deb2a93e8d (diff) | |
| download | php-git-1da15600ae145a953b87682a370d940fbe95044a.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 609fd98309..2b952801ad 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -391,6 +391,7 @@ php_mysqlnd_greet_read(MYSQLND_CONN_DATA * conn, void * _packet) packet->server_capabilities = uint2korr(p); p+= 2; BAIL_IF_NO_MORE_DATA; + DBG_INF_FMT("4.1 server_caps=%u\n", (uint32_t) packet->server_capabilities); packet->charset_no = uint1korr(p); p++; @@ -420,7 +421,8 @@ php_mysqlnd_greet_read(MYSQLND_CONN_DATA * conn, void * _packet) p--; /* Additional 16 bits for server capabilities */ - packet->server_capabilities |= (uint32_t) uint2korr(pad_start) << 16; + DBG_INF_FMT("additional 5.5+ caps=%u\n", (uint32_t) uint2korr(pad_start)); + packet->server_capabilities |= ((uint32_t) uint2korr(pad_start)) << 16; /* And a length of the server scramble in one byte */ packet->authentication_plugin_data.l = uint1korr(pad_start + 2); if (packet->authentication_plugin_data.l > SCRAMBLE_LENGTH) { |