From da011a312a6c6cd7ff12fe1aa0de1e33fba2f167 Mon Sep 17 00:00:00 2001 From: Darek Slusarczyk Date: Mon, 22 Feb 2021 11:03:24 +0100 Subject: 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 --- ext/mysqli/php_mysqli_structs.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ext/mysqli/php_mysqli_structs.h') 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 #include #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; -- cgit v1.2.1