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/mysqli/mysqli_nonapi.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/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 36368755de..e12decbd4b 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -118,9 +118,11 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */ /* remove some insecure options */ flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via connect parameter */ +#if !defined(MYSQLI_USE_MYSQLND) if (PG(open_basedir) && PG(open_basedir)[0] != '\0') { flags &= ~CLIENT_LOCAL_FILES; } +#endif } if (!socket_len || !socket) { |