From: Timm Friebe <thekid@php.net>
Date: Sun, 9 Nov 2008 11:39:14 +0000 (+0000)
Subject: - Fixed sybase_close() to actually close connections
X-Git-Tag: BEFORE_NS_RULES_CHANGE~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39bd93bc62f968d74ce14d9ac17dbe1f439ea78f;p=php

- Fixed sybase_close() to actually close connections
# Broken during parameter parsing refactoring lately, OK in PHP_5_2
---

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index b1661bb19e..2c6d64bfcf 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -979,8 +979,11 @@ PHP_FUNCTION(sybase_close)
 
 	ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id, "Sybase-Link", le_link, le_plink);
 
-	zend_list_delete(Z_RESVAL_P(sybase_link_index));
-	if (Z_RESVAL_P(sybase_link_index) == SybCtG(default_link)) {
+	if (id == -1) {
+		zend_list_delete(Z_RESVAL_P(sybase_link_index));
+	}
+	if (id != -1 || (sybase_link_index && Z_RESVAL_P(sybase_link_index) == SybCtG(default_link))) {
+		zend_list_delete(SybCtG(default_link));
 		SybCtG(default_link) = -1;
 	}