diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-20 13:32:53 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-20 13:33:45 +0200 |
| commit | 3771d661426f33a27590b05df9c8983a2273fab6 (patch) | |
| tree | 427df7fcca9778975d83ecebf072e019f23ba8b8 /ext/mysqlnd/mysqlnd_wireprotocol.c | |
| parent | 5e19f1d458556183230fe0e09a6a24b413553e9b (diff) | |
| parent | cdf16c010a11fc1f91c8807556ccc15b374c0922 (diff) | |
| download | php-git-3771d661426f33a27590b05df9c8983a2273fab6.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix the problem for connect_attr, set db condition, and add a new attribute _server_host
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 82df845daa..6459fe4964 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -546,7 +546,7 @@ size_t php_mysqlnd_auth_write(MYSQLND_CONN_DATA * conn, void * _packet) p+= packet->auth_data_len; } - if (packet->db) { + if (packet->db_len > 0) { /* CLIENT_CONNECT_WITH_DB should have been set */ size_t real_db_len = MIN(MYSQLND_MAX_ALLOWED_DB_LEN, packet->db_len); memcpy(p, packet->db, real_db_len); |