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/mysqlnd_connection.c | |
| 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/mysqlnd_connection.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_connection.c | 9 |
1 files changed, 8 insertions, 1 deletions
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); |