Fix GH-17900 and GH-8084#17908

nielsdos wants to merge 2 commits intophp:masterphp/php-src:masterfrom

nielsdos:mysqli-no-double-constructnielsdos/php-src:mysqli-no-double-constructCopy head branch name to clipboard