cvs: php-src /ext/pdo pdo_dbh.c

iliaa Fri Jul 8 19:33:36 2005 EDT Modified files: /php-src/ext/pdo pdo_dbh.c Log: Fix needed for PostgreSQL driver to allow $user & $pass to be supplied via DSN as NULL. http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.79&r2=1.80&ty=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.79 php-src/ext/pdo/pdo_dbh.c:1.80 --- php-src/ext/pdo/pdo_dbh.c:1.79 Fri Jul 8 00:12:58 2005 +++ php-src/ext/pdo/pdo_dbh.c Fri Jul 8 19:33:35 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.79 2005/07/08 04:12:58 wez Exp $ */ +/* $Id: pdo_dbh.c,v 1.80 2005/07/08 23:33:35 iliaa Exp $ */ /* The PDO Database Handle Class */ @@ -357,12 +357,12 @@ dbh->data_source_len = strlen(colon + 1); dbh->data_source = (const char*)pestrdup(colon + 1, is_persistent); - dbh->username = username ? pestrdup(username, is_persistent) : NULL; - dbh->password = password ? pestrdup(password, is_persistent) : NULL; + dbh->username = usernamelen ? pestrdup(username, is_persistent) : NULL; + dbh->password = passwordlen ? pestrdup(password, is_persistent) : NULL; dbh->auto_commit = pdo_attr_lval(options, PDO_ATTR_AUTOCOMMIT, 1 TSRMLS_CC); - if (!dbh->data_source || (username && !dbh->username) || (password && !dbh->password)) { + if (!dbh->data_source || (usernamelen && !dbh->username) || (passwordlen && !dbh->password)) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "out of memory"); }