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

- (ifx_do_close) Added

1 files changed, 48 insertions, 14 deletions

diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index 733d9445d8..e87ef18aec 100644
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -278,36 +278,70 @@ EXEC SQL END DECLARE SECTION;
 	return(ifx_err_msg);
 }
 
-static void _close_ifx_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
+static void ifx_do_close(link)
 EXEC SQL BEGIN DECLARE SECTION;
-	char *link;
+	PARAMETER 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;
+		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)
+{
+	char *link;
+
+	link=(char *)rsrc->ptr;
+
+	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)--;