Fixed domain socket / named pipe handling

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 7311fd8a00510f1074c677201572efb79d54e090..fa41ec07e1cf6d9dc311c24d30bd989eb1a203de 100755 (executable)
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -279,7 +279,11 @@ static struct pdo_dbh_methods mysql_methods = {
 };
 
 #ifndef PDO_MYSQL_UNIX_ADDR
-# define PDO_MYSQL_UNIX_ADDR   "MySQL"
+# ifndef PHP_WIN32
+#  define PDO_MYSQL_UNIX_ADDR  "MySQL"
+# else
+#  define PDO_MYSQL_UNIX_ADDR  "/tmp/mysql.sock"
+# endif
 #endif
 
 static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC) /* {{{ */
@@ -322,14 +326,9 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
        
        mysql_handle_autocommit(dbh TSRMLS_CC);
 
-#ifndef PHP_WIN32
        if (vars[2].optval && !strcmp("localhost", vars[2].optval)) {
-               host = ".";
                unix_socket = vars[4].optval;  
-       } else
-#endif
-       {
-               host = vars[2].optval;
+       } else {
                port = atoi(vars[3].optval); 
        }
        dbname = vars[1].optval;