diff options
author | Darek Slusarczyk <dariusz.slusarczyk@oracle.com> | 2019-02-11 18:08:21 +0100 |
---|---|---|
committer | Darek Slusarczyk <dariusz.slusarczyk@oracle.com> | 2019-02-11 18:08:21 +0100 |
commit | 83d2bc9b6df2f827217f1bc3298fb83cfe2ac210 (patch) | |
tree | d511c4d57e63ff0d0de4e8f17783d62e6deb224b /ext/mysqli/mysqli.c | |
parent | ec28d4c247ef3c7ab9af41ff6e26b802694492b2 (diff) | |
parent | 2eaabf06fc5a62104ecb597830b2852d71b0a111 (diff) | |
download | php-git-83d2bc9b6df2f827217f1bc3298fb83cfe2ac210.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'ext/mysqli/mysqli.c')
-rw-r--r-- | ext/mysqli/mysqli.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 2d3b08bcb5..9e9f45fef9 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -524,7 +524,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("mysqli.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals) #endif STD_PHP_INI_BOOLEAN("mysqli.reconnect", "0", PHP_INI_SYSTEM, OnUpdateLong, reconnect, zend_mysqli_globals, mysqli_globals) - STD_PHP_INI_BOOLEAN("mysqli.allow_local_infile", "1", PHP_INI_SYSTEM, OnUpdateLong, allow_local_infile, zend_mysqli_globals, mysqli_globals) + STD_PHP_INI_BOOLEAN("mysqli.allow_local_infile", "0", PHP_INI_SYSTEM, OnUpdateLong, allow_local_infile, zend_mysqli_globals, mysqli_globals) PHP_INI_END() /* }}} */ @@ -549,7 +549,7 @@ static PHP_GINIT_FUNCTION(mysqli) mysqli_globals->reconnect = 0; mysqli_globals->report_mode = 0; mysqli_globals->report_ht = 0; - mysqli_globals->allow_local_infile = 1; + mysqli_globals->allow_local_infile = 0; #ifdef HAVE_EMBEDDED_MYSQLI mysqli_globals->embedded = 1; #else |