Various ext/uri fixes#19132

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

kocsismate:ext-url-fixeskocsismate/php-src:ext-url-fixesCopy head branch name to clipboard