diff options
| author | Romolo Manfredini <romolo@php.net> | 2001-04-05 12:29:24 +0000 |
|---|---|---|
| committer | Romolo Manfredini <romolo@php.net> | 2001-04-05 12:29:24 +0000 |
| commit | 0509957bc387d23a0bd42364dbf36da0b0cd95bc (patch) | |
| tree | 1b1754a9875bd83f4d80cae76b56c883c66ce08a | |
| parent | 1280c0a2a2e7be8bf8af1e2371e011222f639124 (diff) | |
| download | php-git-0509957bc387d23a0bd42364dbf36da0b0cd95bc.tar.gz | |
pg_close not closing right connection.
| -rw-r--r-- | ext/pgsql/pgsql.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index fdc20e4701..8d5044fe07 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -117,14 +117,13 @@ static void php_pgsql_set_default_link(int id) { PGLS_FETCH(); + zend_list_addref(id); + if (PGG(default_link) != -1) { zend_list_delete(PGG(default_link)); } - if (PGG(default_link) != id) { PGG(default_link) = id; - zend_list_addref(id); - } } @@ -512,8 +511,7 @@ PHP_FUNCTION(pg_pconnect) PHP_FUNCTION(pg_close) { zval **pgsql_link = NULL; - void *ptr; - int id, type; + int id; PGconn *pgsql; PGLS_FETCH(); @@ -539,10 +537,6 @@ PHP_FUNCTION(pg_close) if (id==-1) { /* explicit resource number */ zend_list_delete(Z_RESVAL_PP(pgsql_link)); - ptr = zend_list_find(Z_RESVAL_PP(pgsql_link),&type); - if (ptr && (type==le_link || type==le_plink)) { - RETURN_TRUE; - } } if (id!=-1 |