diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-16 16:58:19 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-11-16 16:59:55 +0800 |
| commit | be6fd4ba89e151b68ddd68e53d6a403c2e8eb862 (patch) | |
| tree | f248aa3560451beee5b41cd0c68cdc2787693fb6 /ext/mysqli/mysqli_api.c | |
| parent | e5abc53701ba5a9b58dfaba3b59881c9c410a8e7 (diff) | |
| download | php-git-be6fd4ba89e151b68ddd68e53d6a403c2e8eb862.tar.gz | |
Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
Actually, this only be fixed if php uses mysqlnd
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 72c029ebc8..47fcb9ecd5 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1824,6 +1824,7 @@ PHP_FUNCTION(mysqli_options) } MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_INITIALIZED); +#if !defined(MYSQLI_USE_MYSQLND) #if PHP_API_VERSION < 20100412 if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') || PG(safe_mode)) { #else @@ -1833,6 +1834,7 @@ PHP_FUNCTION(mysqli_options) RETURN_FALSE; } } +#endif expected_type = mysqli_options_get_option_zval_type(mysql_option); if (expected_type != Z_TYPE_PP(mysql_value)) { switch (expected_type) { |