From: Danny Heijl <danny@php.net>
Date: Mon, 7 Aug 2000 20:45:57 +0000 (+0000)
Subject: - fix for # 5980 (using ifx_connect/ifx_close multiple times for the
X-Git-Tag: php-4.0.2RC1~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8790d9e2c87d0fa96a2a19b8203d9dd7f773ed8;p=php

- fix for # 5980 (using ifx_connect/ifx_close multiple times for the
  same database connection) (danny)
---

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;