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

- Fixed bug #18534 (ifx_close() leaves open session)

Browse source 
- (ifx_do_close) Added
This commit is contained in:
Corne' Cornelius 2003-10-07 09:29:58 +00:00
parent dd7bdcf4b1
commit 5eb3a1dfdd
1 changed files with 48 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

62
ext/informix/ifx.ec
View file

@ -278,36 +278,70 @@ EXEC SQL END DECLARE SECTION;
return(ifx_err_msg);
}
static void ifx_do_close(link)
EXEC SQL BEGIN DECLARE SECTION;
PARAMETER char *link;
EXEC SQL END DECLARE SECTION;
{
EXEC SQL SET CONNECTION :link;
if (ifx_check() >= 0) {
EXEC SQL DISCONNECT :link;
/* check if were in a transaction */
if (SQLCODE == -1800) {
EXEC SQL SET CONNECTION :link;
EXEC SQL ROLLBACK WORK;
if (ifx_check() == 0) {
/* DISCONNECT again, after rollback */
EXEC SQL DISCONNECT :link;
if (ifx_check() < 0) {
IFXG(sv_sqlcode) = SQLCODE;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Disconnect link %s after Automatic Rollback fails (%s)", link, ifx_error(link));
}
}
if (ifx_check() < 0) {
/* CLOSE database if rollback or disconnect fails */
EXEC SQL CLOSE DATABASE;
if (ifx_check() < 0) {
IFXG(sv_sqlcode) = SQLCODE;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Close database fails %s (%s)", link, ifx_error(link));
}
}
}
else if (SQLCODE < 0) {
IFXG(sv_sqlcode) = SQLCODE;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Disconnect link %s fails (%s)", link, ifx_error(link));
}
}
else {
IFXG(sv_sqlcode) = SQLCODE;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Set connection %s fails (%s)", link, ifx_error(link));
}
}
static void _close_ifx_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
EXEC SQL BEGIN DECLARE SECTION;
char *link;
EXEC SQL END DECLARE SECTION;
link=(char *)rsrc->ptr;
EXEC SQL SET CONNECTION :link;
if (ifx_check() >= 0) {
EXEC SQL close database;
EXEC SQL DISCONNECT CURRENT;
}
ifx_do_close(link);
efree(link);
IFXG(num_links)--;
}
static void _close_ifx_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
EXEC SQL BEGIN DECLARE SECTION;
char *link;
EXEC SQL END DECLARE SECTION;
link = (char *)rsrc->ptr;
EXEC SQL SET CONNECTION :link;
if (ifx_check() >= 0) {
EXEC SQL close database;
EXEC SQL DISCONNECT CURRENT;
}
ifx_do_close(link);
free(link);
IFXG(num_persistent)--;
IFXG(num_links)--;