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 /ext/mysqli/php_mysqli_structs.h | |
| 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 'ext/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index a39e68b276..b86b58c944 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -46,6 +46,7 @@ typedef _Bool my_bool; #include <errmsg.h> #include <mysqld_error.h> #include "mysqli_libmysql.h" + #endif /* MYSQLI_USE_MYSQLND */ @@ -276,6 +277,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli) char *default_pw; zend_long reconnect; zend_long allow_local_infile; + char *local_infile_directory; zend_long strict; zend_long error_no; char *error_msg; |