]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 25 Mar 2019 15:42:48 +0000 (16:42 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 25 Mar 2019 15:43:21 +0000 (16:43 +0100)
1  2 
NEWS
ext/interbase/interbase.c

diff --cc NEWS
index 9f3dd9916a912616d78249d37fa1d32d3b762ad5,8165400d84dcb9286e871a5b439a3e3ca93f2615..749ca91a7ac155fc7c3a2c5700f6adf6829b29e6
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,11 +1,15 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2019, PHP 7.2.18
 +?? ??? ????, PHP 7.3.5
  
+ - interbase:
+   . Fixed bug #72175 (Impossibility of creating multiple connections to
+     Interbase with php 7.x). (Nikita)
 +- MySQLi:
 +  . Fixed bug #77773 (Unbuffered queries leak memory - MySQLi / mysqlnd).
 +    (Nikita)
 +
  - phpdbg:
    . Fixed bug #76801 (too many open files). (alekitto)
  
index 478133296ba96e8ca9db387f36ae40808b7c65fe,6f28b3f4a5a798d5decd3ee464a40f475e63935c..d62085ccdb860aaad0dfe67a1fdc8857aeb3ddf6
@@@ -939,13 -939,15 +939,15 @@@ static void _php_ibase_connect(INTERNAL
  
                xlink = (zend_resource*) le->ptr;
                if ((!persistent && xlink->type == le_link) || xlink->type == le_plink) {
-                       if (IBG(default_link)) {
-                               zend_list_close(IBG(default_link));
+                       if (IBG(default_link) != xlink) {
 -                              GC_REFCOUNT(xlink)++;
++                              GC_ADDREF(xlink);
+                               if (IBG(default_link)) {
+                                       zend_list_delete(IBG(default_link));
+                               }
+                               IBG(default_link) = xlink;
                        }
 -                      GC_REFCOUNT(xlink)++;
 +                      GC_ADDREF(xlink);
-                       GC_ADDREF(xlink);
-                       IBG(default_link) = xlink;
-                       RETVAL_RES(xlink);
+                       RETURN_RES(xlink);
                } else {
                        zend_hash_str_del(&EG(regular_list), hash, sizeof(hash)-1);
                }