[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c

[Zeev Suraski]

zeev            Wed Feb 14 18:15:36 2001 EDT

  Modified files:              
    /php4/ext/pgsql     pgsql.c 
  Log:
  Fix the PostgreSQL fix...
  
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.88 php4/ext/pgsql/pgsql.c:1.89
--- php4/ext/pgsql/pgsql.c:1.88 Tue Feb 13 12:13:14 2001
+++ php4/ext/pgsql/pgsql.c      Wed Feb 14 18:15:36 2001
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
  
-/* $Id: pgsql.c,v 1.88 2001/02/13 20:13:14 thies Exp $ */
+/* $Id: pgsql.c,v 1.89 2001/02/15 02:15:36 zeev Exp $ */
 
 #include <stdlib.h>
 
@@ -114,7 +114,7 @@
 {   
        PGLS_FETCH();
 
-    if ((PGG(default_link) != -1) && (PGG(default_link) != id)) {
+    if (PGG(default_link) != -1) {
         zend_list_delete(PGG(default_link));
     }
 
@@ -423,9 +423,9 @@
                        ptr = zend_list_find(link,&type);   /* check if the link is 
still there */
                        if (ptr && (type==le_link || type==le_plink)) {
                                return_value->value.lval = link;
+                               zend_list_addref(link);
                                php_pgsql_set_default_link(link);
                                return_value->type = IS_RESOURCE;
-                               zend_list_addref(link);
                                efree(hashed_details);
                                return;
                        } else {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]