hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2018-11-13 17:35:45 +02:00
parent cdce11391a fb84b2690a
commit 433c6708bf
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -605,7 +605,11 @@ static void store_client_information(DCB* dcb, GWBUF* buffer)
mxb_assert(MYSQL_GET_PAYLOAD_LEN(data) + MYSQL_HEADER_LEN == len
|| len == MYSQL_AUTH_PACKET_BASE_SIZE); // For SSL request packet
proto->client_capabilities = gw_mysql_get_byte4(data + MYSQL_CLIENT_CAP_OFFSET);
// We OR the capability bits in order to retain the starting bits sent
// when an SSL connection is opened. Oracle Connector/J 8.0 appears to drop
// the SSL capability bit mid-authentication which causes MaxScale to think
// that SSL is not used.
proto->client_capabilities |= gw_mysql_get_byte4(data + MYSQL_CLIENT_CAP_OFFSET);
proto->charset = data[MYSQL_CHARSET_OFFSET];
/** MariaDB 10.2 compatible clients don't set the first bit to signal that