diff options
| author | Darek Slusarczyk <dariusz.slusarczyk@oracle.com> | 2019-02-11 18:08:21 +0100 |
|---|---|---|
| committer | Darek Slusarczyk <dariusz.slusarczyk@oracle.com> | 2019-02-11 18:08:21 +0100 |
| commit | 83d2bc9b6df2f827217f1bc3298fb83cfe2ac210 (patch) | |
| tree | d511c4d57e63ff0d0de4e8f17783d62e6deb224b /ext/mysqlnd/mysqlnd_connection.c | |
| parent | ec28d4c247ef3c7ab9af41ff6e26b802694492b2 (diff) | |
| parent | 2eaabf06fc5a62104ecb597830b2852d71b0a111 (diff) | |
| download | php-git-83d2bc9b6df2f827217f1bc3298fb83cfe2ac210.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'ext/mysqlnd/mysqlnd_connection.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_connection.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c index ea3d1cb0b7..dc42a16b6d 100644 --- a/ext/mysqlnd/mysqlnd_connection.c +++ b/ext/mysqlnd/mysqlnd_connection.c @@ -489,7 +489,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * MYSQLND_VIO * vio = conn->vio; DBG_ENTER("mysqlnd_conn_data::get_updated_connect_flags"); - /* we allow load data local infile by default */ + /* allow CLIENT_LOCAL_FILES capability, although extensions basing on mysqlnd + shouldn't allow 'load data local infile' by default due to security issues */ mysql_flags |= MYSQLND_CAPABILITIES; mysql_flags |= conn->options->flags; /* use the flags from set_client_option() */ |