[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c

[Timm Friebe]

thekid          Sun Nov  9 11:39:14 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/sybase_ct      php_sybase_ct.c 
  Log:
  - Fixed sybase_close() to actually close connections
  # Broken during parameter parsing refactoring lately, OK in PHP_5_2
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.13.2.11&r2=1.103.2.5.2.13.2.12&diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.11 
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.12
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.11   Sat Nov  8 
13:22:14 2008
+++ php-src/ext/sybase_ct/php_sybase_ct.c       Sun Nov  9 11:39:14 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.11 2008/11/08 13:22:14 thekid Exp $ 
*/
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.12 2008/11/09 11:39:14 thekid Exp $ 
*/
 
 
 #ifdef HAVE_CONFIG_H
@@ -979,8 +979,11 @@
 
        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;
        }
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php