summaryrefslogtreecommitdiff
path: root/ext/informix
diff options
context:
space:
mode:
authorDanny Heijl <danny@php.net>2000-08-07 20:45:57 +0000
committerDanny Heijl <danny@php.net>2000-08-07 20:45:57 +0000
commitd8790d9e2c87d0fa96a2a19b8203d9dd7f773ed8 (patch)
tree200158bc686569f57b7f5f9208d34a659bd1a40f /ext/informix
parent5d02c74b6bde6013dd8475611b5e4b4ce22a8198 (diff)
downloadphp-git-d8790d9e2c87d0fa96a2a19b8203d9dd7f773ed8.tar.gz
- fix for # 5980 (using ifx_connect/ifx_close multiple times for the
same database connection) (danny)
Diffstat (limited to 'ext/informix')
-rw-r--r--ext/informix/ifx.ec10
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index 255af0c8e0..9a02fea67d 100644
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -284,6 +284,7 @@ static void _close_ifx_link(link)
IFXLS_FETCH();
EXEC SQL SET CONNECTION :link;
+ EXEC SQL close database;
EXEC SQL DISCONNECT CURRENT;
efree(link);
IFXG(num_links)--;
@@ -298,6 +299,7 @@ EXEC SQL END DECLARE SECTION;
IFXLS_FETCH();
EXEC SQL SET CONNECTION :link;
+ EXEC SQL close database;
EXEC SQL DISCONNECT CURRENT;
free(link);
@@ -723,7 +725,7 @@ static void php3_ifx_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
WITH CONCURRENT TRANSACTION;
if (ifx_check() == IFX_ERROR) {
IFXG(sv_sqlcode) = SQLCODE;
- php_error(E_WARNING,"ifx_pconnect : %s", ifx_error(ifx));
+ php_error(E_WARNING,"ifx_connect : %s", ifx_error(ifx));
efree(hashed_details);
efree(ifx);
RETURN_FALSE;
@@ -820,9 +822,9 @@ EXEC SQL END DECLARE SECTION;
ZEND_FETCH_RESOURCE2(ifx, char *, ifx_link, id, "IFX link", IFXL(le_link), IFXL(le_plink));
- EXEC SQL SET CONNECTION :ifx;
- EXEC SQL close database;
- EXEC SQL DISCONNECT CURRENT;
+ /* EXEC SQL SET CONNECTION :ifx; */
+ /* EXEC SQL close database; */
+ /* EXEC SQL DISCONNECT CURRENT; */
zend_list_delete(id);
RETURN_TRUE;