mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Merge branch 'PHP-7.3' into PHP-7.4
This commit is contained in:
commit
d50dcbe659
@ -88,7 +88,7 @@
|
||||
#define PQ_SETNONBLOCKING(pg_link, flag) 0
|
||||
#endif
|
||||
|
||||
#define CHECK_DEFAULT_LINK(x) if ((x) == NULL) { php_error_docref(NULL, E_WARNING, "No PostgreSQL link opened yet"); }
|
||||
#define CHECK_DEFAULT_LINK(x) if ((x) == NULL) { php_error_docref(NULL, E_WARNING, "No PostgreSQL link opened yet"); RETURN_FALSE; }
|
||||
#define FETCH_DEFAULT_LINK() PGG(default_link)
|
||||
|
||||
#ifndef HAVE_PQFREEMEM
|
||||
@ -1566,13 +1566,15 @@ PHP_FUNCTION(pg_close)
|
||||
return;
|
||||
}
|
||||
|
||||
if (pgsql_link) {
|
||||
link = Z_RES_P(pgsql_link);
|
||||
} else {
|
||||
link = FETCH_DEFAULT_LINK();
|
||||
if (!pgsql_link) {
|
||||
link = PGG(default_link);
|
||||
CHECK_DEFAULT_LINK(link);
|
||||
zend_list_delete(link);
|
||||
PGG(default_link) = NULL;
|
||||
RETURN_TRUE;
|
||||
}
|
||||
|
||||
link = Z_RES_P(pgsql_link);
|
||||
if (zend_fetch_resource2(link, "PostgreSQL link", le_link, le_plink) == NULL) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
15
ext/pgsql/tests/close_default_link.phpt
Normal file
15
ext/pgsql/tests/close_default_link.phpt
Normal file
@ -0,0 +1,15 @@
|
||||
--TEST--
|
||||
pg_close() default link after connection variable has been dropped
|
||||
--SKIPIF--
|
||||
<?php include("skipif.inc"); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
include('config.inc');
|
||||
|
||||
/* Run me under valgrind */
|
||||
$db1 = pg_connect($conn_str);
|
||||
unset($db1);
|
||||
var_dump(pg_close());
|
||||
?>
|
||||
--EXPECT--
|
||||
bool(true)
|
Loading…
Reference in New Issue
Block a user