archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source
This commit is contained in:
Nikita Popov 2019-04-10 10:38:52 +02:00
commit d50dcbe659
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/pgsql/pgsql.c
View file

@ -88,7 +88,7 @@
#define PQ_SETNONBLOCKING(pg_link, flag) 0 #define PQ_SETNONBLOCKING(pg_link, flag) 0
#endif #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) #define FETCH_DEFAULT_LINK() PGG(default_link)
#ifndef HAVE_PQFREEMEM #ifndef HAVE_PQFREEMEM
@ -1566,13 +1566,15 @@ PHP_FUNCTION(pg_close)
return; return;
} }
if (pgsql_link) { if (!pgsql_link) {
link = Z_RES_P(pgsql_link); link = PGG(default_link);
} else {
link = FETCH_DEFAULT_LINK();
CHECK_DEFAULT_LINK(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) { if (zend_fetch_resource2(link, "PostgreSQL link", le_link, le_plink) == NULL) {
RETURN_FALSE; RETURN_FALSE;
} }

15
ext/pgsql/tests/close_default_link.phpt Normal file
View 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)