diff options
| author | Qianqian Bu <qibu@microsoft.com> | 2019-08-12 04:00:31 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-20 13:31:58 +0200 |
| commit | cdf16c010a11fc1f91c8807556ccc15b374c0922 (patch) | |
| tree | 1cc70da2d80d4315ce9306fdf9b0489e0ac4d113 /ext/mysqlnd | |
| parent | 81f52158b42318f17f67468cccc4a8dc03bba942 (diff) | |
| download | php-git-cdf16c010a11fc1f91c8807556ccc15b374c0922.tar.gz | |
fix the problem for connect_attr, set db condition, and add a new attribute _server_host
Diffstat (limited to 'ext/mysqlnd')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.c | 3 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_connection.c | 9 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index 3ba447cfdf..2b23257b73 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -425,6 +425,9 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, auth_packet->auth_data_len = auth_plugin_data_len; auth_packet->auth_plugin_name = auth_protocol; + if (conn->server_capabilities & CLIENT_CONNECT_ATTRS) { + auth_packet->connect_attr = conn->options->connect_attr; + } if (conn->m->get_server_version(conn) >= 50123) { auth_packet->charset_no = conn->charset->nr; diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c index 42de003ef9..b5b3f45658 100644 --- a/ext/mysqlnd/mysqlnd_connection.c +++ b/ext/mysqlnd/mysqlnd_connection.c @@ -519,6 +519,10 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * } #endif + if (conn->options->connect_attr && zend_hash_num_elements(conn->options->connect_attr)) { + mysql_flags |= CLIENT_CONNECT_ATTRS; + } + DBG_RETURN(mysql_flags); } /* }}} */ @@ -665,7 +669,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, password.s = ""; password.l = 0; } - if (!database.s) { + if (!database.s || !database.s[0]) { DBG_INF_FMT("no db given, using empty string"); database.s = ""; database.l = 0; @@ -833,6 +837,9 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn_handle, if (PASS == conn->m->local_tx_start(conn, this_func)) { mysqlnd_options4(conn_handle, MYSQL_OPT_CONNECT_ATTR_ADD, "_client_name", "mysqlnd"); + if (hostname.l > 0) { + mysqlnd_options4(conn_handle, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_host", hostname.s); + } ret = conn->m->connect(conn, hostname, username, password, database, port, socket_or_pipe, mysql_flags); conn->m->local_tx_end(conn, this_func, FAIL); diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 7616540e4f..759b131b63 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -552,7 +552,7 @@ size_t php_mysqlnd_auth_write(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); |