From: George Schlossnagle <gschlossnagle@php.net>
Date: Wed, 31 Aug 2005 03:48:01 +0000 (+0000)
Subject: Set port even if host is localhost.
X-Git-Tag: PRE_NEW_OCI8_EXTENSION~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2e9f5d9a5b069a442988bb46434f1e7096e38f8;p=php

Set port even if host is localhost.

Should resolve 34072
---

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 415440537f..5fdd443622 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -422,14 +422,15 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 			goto cleanup;
 		}
 	}
-	
+
+	dbname = vars[1].optval;
+    host = vars[2].optval;	
+	if(vars[3].optval) {
+		port = atoi(vars[3].optval);
+	}
 	if (vars[2].optval && !strcmp("localhost", vars[2].optval)) {
 		unix_socket = vars[4].optval;  
-	} else {
-		host = vars[2].optval;
-		port = atoi(vars[3].optval); 
 	}
-	dbname = vars[1].optval;
 	if (mysql_real_connect(H->server, host, dbh->username, dbh->password, dbname, port, unix_socket, connect_opts) == NULL) {
 		pdo_mysql_error(dbh);
 		goto cleanup;