diff options
| author | Anatol Belski <ab@php.net> | 2015-01-15 17:51:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-15 17:51:43 +0100 |
| commit | 29688512b4579fc0f9dcd86587ce0e53855843d6 (patch) | |
| tree | 62428d8c75cb6bada3a1148f89fa44277cbbaa30 /ext/pdo_mysql/mysql_driver.c | |
| parent | fc33f52d8c25997dd0711de3e07d0dc260a18c11 (diff) | |
| parent | 25041d2af2f7a5b50a6c6a6f0515521aa2edfac9 (diff) | |
| download | php-git-29688512b4579fc0f9dcd86587ce0e53855843d6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
Conflicts:
ext/pdo_mysql/mysql_driver.c
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 1df1e13109..467298ef1d 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -748,7 +748,12 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options) if(vars[3].optval) { port = atoi(vars[3].optval); } + +#ifdef PHP_WIN32 + if (vars[2].optval && !strcmp(".", vars[2].optval)) { +#else if (vars[2].optval && !strcmp("localhost", vars[2].optval)) { +#endif unix_socket = vars[4].optval; } |