From: Hartmut Holzgraefe <hholzgra@php.net>
Date: Sun, 13 Feb 2005 06:52:45 +0000 (+0000)
Subject: Fixed domain socket / named pipe handling
X-Git-Tag: RELEASE_0_2_3~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6828f5949cf71299aab622529a708a6393cfb7d;p=php

Fixed domain socket / named pipe handling
---

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 7311fd8a00..fa41ec07e1 100755
--- 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;