cvs: php-src /ext/pdo_pgsql pgsql_driver.c

iliaa Tue Dec 4 13:07:30 2007 UTC Modified files: /php-src/ext/pdo_pgsql pgsql_driver.c Log: MFB: Fixed bug #43493 (pdo_pgsql does not send username on connect when password is not available) http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.66&r2=1.67&diff_format=u Index: php-src/ext/pdo_pgsql/pgsql_driver.c diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.66 php-src/ext/pdo_pgsql/pgsql_driver.c:1.67 --- php-src/ext/pdo_pgsql/pgsql_driver.c:1.66 Mon Jan 1 09:29:28 2007 +++ php-src/ext/pdo_pgsql/pgsql_driver.c Tue Dec 4 13:07:30 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql_driver.c,v 1.66 2007/01/01 09:29:28 sebastian Exp $ */ +/* $Id: pgsql_driver.c,v 1.67 2007/12/04 13:07:30 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -493,14 +493,14 @@ } /* support both full connection string & connection string + login and/or password */ - if (!dbh->username || !dbh->password) { - conn_str = (char *) dbh->data_source; - } else if (dbh->username && dbh->password) { + if (dbh->username && dbh->password) { spprintf(&conn_str, 0, "%s user=%s password=%s", dbh->data_source, dbh->username, dbh->password); } else if (dbh->username) { spprintf(&conn_str, 0, "%s user=%s", dbh->data_source, dbh->username); - } else { + } else if (dbh->password) { spprintf(&conn_str, 0, "%s password=%s", dbh->data_source, dbh->password); + } else { + conn_str = (char *) dbh->data_source; } H->server = PQconnectdb(conn_str);