diff options
| author | Andrey Hristov <andrey@php.net> | 2013-01-09 18:30:56 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-01-09 18:30:56 +0100 |
| commit | cb6071ef54779e392cf50831399dfd66939de9a0 (patch) | |
| tree | 27c4b60d37a848b674c734403a324ff6fe9adade | |
| parent | ddcb67d446ba7a0637fdf3a52bdaaaa99ee80755 (diff) | |
| parent | 6a6ec195acb0a67b8728dd32fad5c82b37b31192 (diff) | |
| download | php-git-cb6071ef54779e392cf50831399dfd66939de9a0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/mysqlnd/mysqlnd.c
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index b9db94b9df..db1b9019cc 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -708,6 +708,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * /* we allow load data local infile by default */ mysql_flags |= MYSQLND_CAPABILITIES; + 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; } |