diff options
| author | Darek Slusarczyk <dariusz.slusarczyk@oracle.com> | 2021-02-22 11:03:24 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-23 09:30:46 +0100 |
| commit | da011a312a6c6cd7ff12fe1aa0de1e33fba2f167 (patch) | |
| tree | c3e37dadfa5ea7aec39ca3695779fe30c7bd96f6 /azure | |
| parent | 7f8ea83ef438fbcfa1cbc636d701491d4e773245 (diff) | |
| download | php-git-da011a312a6c6cd7ff12fe1aa0de1e33fba2f167.tar.gz | |
Fix #80329: Add option to specify LOAD DATA LOCAL white list folder
* allow the user to specify a folder where files that can be sent
via LOAD DATA LOCAL can exist
* add mysqli.local_infile_directory for mysqli
(ignored if mysqli.allow_local_infile is enabled)
* add PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY for pdo_mysql
(ignored if PDO::MYSQL_ATTR_LOCAL_INFILE is enabled)
* add related tests
* fixes for building with libmysql 8.x
* small improvement in existing tests
* update php.ini-[development|production] files
Closes GH-6448.
Co-authored-by: Nikita Popov <nikic@php.net>
Diffstat (limited to 'azure')
| -rw-r--r-- | azure/libmysqlclient_job.yml | 2 | ||||
| -rw-r--r-- | azure/setup.yml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/azure/libmysqlclient_job.yml b/azure/libmysqlclient_job.yml index 72be92780f..e61b8de95f 100644 --- a/azure/libmysqlclient_job.yml +++ b/azure/libmysqlclient_job.yml @@ -18,6 +18,8 @@ jobs: set -o sudo service mysql start mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" + # Ensure local_infile tests can run. + mysql -uroot -proot -e "SET GLOBAL local_infile = true" displayName: 'Setup MySQL server' # Does not support caching_sha2_auth :( #- template: libmysqlclient_test.yml diff --git a/azure/setup.yml b/azure/setup.yml index 21fccd415b..2ca344228c 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -5,6 +5,8 @@ steps: sudo service postgresql start sudo service slapd start mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" + # Ensure local_infile tests can run. + mysql -uroot -proot -e "SET GLOBAL local_infile = true" sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" sudo -u postgres psql -c "CREATE DATABASE test;" docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" |