com php-src: Merge branch 'PHP-5.6': ext/pdo_mysql/mysql_dr iver.c
| From: | Anatol Belski | Date: | Thu, 15 Jan 2015 16:51:43 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/pdo_mysql/mysql_dr iver.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84115@lists.php.net to get a copy of this message | ||
Commit: 29688512b4579fc0f9dcd86587ce0e53855843d6
Author: Anatol Belski <ab@php.net> Thu, 15 Jan 2015 17:51:43 +0100
Parents: fc33f52d8c25997dd0711de3e07d0dc260a18c11 25041d2af2f7a5b50a6c6a6f0515521aa2edfac9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29688512b4579fc0f9dcd86587ce0e53855843d6
Log:
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
Changed paths:
MM ext/pdo_mysql/mysql_driver.c
Diff:
diff --cc ext/pdo_mysql/mysql_driver.c
index 1df1e13,f198753..467298e
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@@ -748,9 -743,14 +748,14 @@@ static int pdo_mysql_handle_factory(pdo
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)) {
+ if (vars[2].optval && !strcmp("localhost", vars[2].optval)) {
+ #endif
- unix_socket = vars[4].optval;
- }
+ unix_socket = vars[4].optval;
+ }
/* TODO: - Check zval cache + ZTS */
#ifdef PDO_USE_MYSQLND