com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/interbase/interbase.c
| From: | Nikita Popov | Date: | Mon, 25 Mar 2019 15:43:21 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/interbase/interbase.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105327@lists.php.net to get a copy of this message | ||
Commit: 91d4d175ab1a0288f4e37d64a8ec948958ed9528
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 25 Mar 2019 16:42:48 +0100
Parents: 93740a2482d5164cf790d38fae018ce4c58d9225 85095dfd0956bc09f5157211948c40cfa2859d27
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=91d4d175ab1a0288f4e37d64a8ec948958ed9528
Log:
Merge branch 'PHP-7.2' into PHP-7.3
Changed paths:
MM NEWS
MM ext/interbase/interbase.c
Diff:
diff --cc NEWS
index 9f3dd99,8165400..749ca91
--- a/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)
diff --cc ext/interbase/interbase.c
index 4781332,6f28b3f..d62085c
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@@ -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);
}