mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* 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
This commit is contained in:
Anatol Belski 2015-01-15 17:51:43 +01:00
commit 29688512b4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/pdo_mysql/mysql_driver.c
View File

@ -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;
}