Fixed bug: php#11728. Error message was cleared before outputted in pg_pconnect()

foobar · foobar · commit bc3482d65f23 · 2001-06-29T03:12:06.000Z
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -434,10 +434,10 @@ void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
 				pgsql=PQsetdb(host,port,options,tty,dbname);
 			}
 			if (pgsql==NULL || PQstatus(pgsql)==CONNECTION_BAD) {
+				php_error(E_WARNING,"Unable to connect to PostgreSQL server:  %s",PQerrorMessage(pgsql));
 				if (pgsql) {
 					PQfinish(pgsql);
 				}
-				php_error(E_WARNING,"Unable to connect to PostgreSQL server:  %s",PQerrorMessage(pgsql));
 				efree(hashed_details);
 				RETURN_FALSE;
 			}

Original file line number	Diff line number	Diff line change
`@@ -434,10 +434,10 @@ void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)`
`434`	`434`	`pgsql=PQsetdb(host,port,options,tty,dbname);`
`435`	`435`	`}`
`436`	`436`	`if (pgsql==NULL \|\| PQstatus(pgsql)==CONNECTION_BAD) {`
	`437`	`+ php_error(E_WARNING,"Unable to connect to PostgreSQL server: %s",PQerrorMessage(pgsql));`
`437`	`438`	`if (pgsql) {`
`438`	`439`	`PQfinish(pgsql);`
`439`	`440`	`}`
`440`		`- php_error(E_WARNING,"Unable to connect to PostgreSQL server: %s",PQerrorMessage(pgsql));`
`441`	`441`	`efree(hashed_details);`
`442`	`442`	`RETURN_FALSE;`
`443`	`443`	`}`