projects
/
php
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
50fb7a8
)
Set port even if host is localhost.
author
George Schlossnagle
<gschlossnagle@php.net>
Wed, 31 Aug 2005 03:48:01 +0000
(
03:48
+0000)
committer
George Schlossnagle
<gschlossnagle@php.net>
Wed, 31 Aug 2005 03:48:01 +0000
(
03:48
+0000)
Should resolve 34072
ext/pdo_mysql/mysql_driver.c
patch
|
blob
|
history
diff --git
a/ext/pdo_mysql/mysql_driver.c
b/ext/pdo_mysql/mysql_driver.c
index 415440537fb57c89175fcc5ff51a0aecc15b5376..5fdd4436222827b4e8e24cb467689dacc470b56b 100755
(executable)
--- 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;