Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix bogus fallthrough path in firebird_handle_get_attribute()
This commit is contained in:
Niels Dossche 2024-07-22 18:33:32 +02:00
commit 46924ac9fa
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 4 additions and 2 deletions

3
NEWS
View file

@ -21,6 +21,9 @@ PHP NEWS
. Fixed bug GH-13817 (Segmentation fault for enabled observers after pass 4).
(Bob)
- PDO_Firebird:
. Fix bogus fallthrough path in firebird_handle_get_attribute(). (nielsdos)
- Soap:
. Fixed bug #55639 (Digest autentication dont work). (nielsdos)

View file

@ -977,8 +977,7 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *v
ZVAL_STRING(val, tmp);
return 1;
}
/* TODO Check this is correct? */
ZEND_FALLTHROUGH;
return -1;
case PDO_ATTR_FETCH_TABLE_NAMES:
ZVAL_BOOL(val, H->fetch_table_names);