From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 8 Jul 2005 23:33:35 +0000 (+0000)
Subject: Fix needed for PostgreSQL driver to allow $user & $pass to be supplied via
X-Git-Tag: php-5.1.0b3~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b1931a8ff0c3e558d5a9b235b0b96750684fcf2;p=php

Fix needed for PostgreSQL driver to allow $user & $pass to be supplied via
DSN as NULL.
---

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index be7deed2e7..12d2a07394 100755
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -357,12 +357,12 @@ static PHP_FUNCTION(dbh_constructor)
 	
 	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");
 	}