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/pdo_mysql/mysql_driver.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/pdo_mysql/mysql_driver.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index f198753100..7297c896bd 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -629,6 +629,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ goto cleanup; } +#ifndef PDO_USE_MYSQLND #if PHP_API_VERSION < 20100412 if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') || PG(safe_mode)) #else @@ -637,6 +638,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ { local_infile = 0; } +#endif #if defined(MYSQL_OPT_LOCAL_INFILE) || defined(PDO_USE_MYSQLND) if (mysql_options(H->server, MYSQL_OPT_LOCAL_INFILE, (const char *)&local_infile)) { pdo_mysql_error(dbh); |