From ce39ba7265862bacb1da32d870dafb6b009dfb30 Mon Sep 17 00:00:00 2001
From: Dan Kalowsky <kalowsky@php.net>
Date: Fri, 26 Apr 2002 14:56:34 +0000
Subject: [PATCH] bug fix for bug #15758, a double free'ing of an ODBC
 connection

---
 ext/odbc/php_odbc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 6ee3e8f7e26..4bf7468e1a9 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2152,8 +2152,13 @@ try_and_get_another_connection:
 
 				if(ret != SQL_SUCCESS || len == 0) {
 					zend_hash_del(&EG(persistent_list), hashed_details, hashed_len + 1);
-					safe_odbc_disconnect(db_conn->hdbc);
-					SQLFreeConnect(db_conn->hdbc);
+					/* Commented out to fix a possible double closure error 
+					 * when working with persistent connections as submitted by
+					 * bug #15758
+					 *
+					 * safe_odbc_disconnect(db_conn->hdbc);
+					 * SQLFreeConnect(db_conn->hdbc);
+					 */
 					goto try_and_get_another_connection;
 				}
 			}