diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-16 11:22:43 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-16 11:22:43 +0200 |
| commit | f684553c2cc6f717447f1bbd69b09ebcd6973dfa (patch) | |
| tree | af84ff9a8ca4a44dcd4ee336f0acb0391645b1be /ext/pdo_mysql/mysql_driver.c | |
| parent | 0a2fd0db3cb57a567954c55e6607cf2102eb91ce (diff) | |
| parent | a1c1736bfb88d006542dc9bcc10d7101617517a6 (diff) | |
| download | php-git-f684553c2cc6f717447f1bbd69b09ebcd6973dfa.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix MySQL local infile / attr handling on big endian systems
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 2f85d8dbb7..cceb587b4e 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -630,7 +630,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* handle MySQL options */ if (driver_options) { zend_long connect_timeout = pdo_attr_lval(driver_options, PDO_ATTR_TIMEOUT, 30); - zend_long local_infile = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_LOCAL_INFILE, 0); + unsigned int local_infile = (unsigned int) pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_LOCAL_INFILE, 0); zend_string *init_cmd = NULL; #ifndef PDO_USE_MYSQLND zend_string *default_file = NULL, *default_group = NULL; @@ -781,7 +781,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options) } else { #if defined(MYSQL_OPT_LOCAL_INFILE) || defined(PDO_USE_MYSQLND) // in case there are no driver options disable 'local infile' explicitly - zend_long local_infile = 0; + unsigned int local_infile = 0; if (mysql_options(H->server, MYSQL_OPT_LOCAL_INFILE, (const char *)&local_infile)) { pdo_mysql_error(dbh); goto cleanup; |