diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-16 17:59:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-11-16 17:59:46 +0800 |
| commit | 9134f9e98f6ccf8ed91cd1271fee7855062c07ff (patch) | |
| tree | de92106b2946eee73b51643504a2bcdc235e0fcc /ext/mysqlnd/mysqlnd.c | |
| parent | 0dce4bef7933920ef151f1f2ef7416f6a5da2afb (diff) | |
| parent | 25439e939e8d6a86bcc1654221460851b43271d5 (diff) | |
| download | php-git-9134f9e98f6ccf8ed91cd1271fee7855062c07ff.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/mysql/php_mysql.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 6d4232dbd5..7e80e8299f 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -756,10 +756,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * mysql_flags |= conn->options->flags; /* use the flags from set_client_option() */ - if (PG(open_basedir) && strlen(PG(open_basedir))) { - mysql_flags ^= CLIENT_LOCAL_FILES; - } - #ifndef MYSQLND_COMPRESSION_ENABLED if (mysql_flags & CLIENT_COMPRESS) { mysql_flags &= ~CLIENT_COMPRESS; |