Skip to content

Update class-amp-http.php #1834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Update class-amp-http.php #1834

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4388932
Update class-amp-http.php
s-a-s-k-i-a Jan 20, 2019
4f428c2
try matching phpcs
s-a-s-k-i-a Jan 20, 2019
9687602
phpcs equals sign missing 1 space char
s-a-s-k-i-a Jan 20, 2019
53a7b87
assure inclusion of patch versions 7.2.x and 7.3.x
s-a-s-k-i-a Jan 23, 2019
5e8dece
Update includes/class-amp-http.php
westonruter Jan 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions includes/class-amp-http.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,15 @@ public static function get_amp_cache_hosts() {
if ( function_exists( 'idn_to_utf8' ) ) {
if ( version_compare( PHP_VERSION, '5.4', '>=' ) && defined( 'INTL_IDNA_VARIANT_UTS46' ) ) {
$domain = idn_to_utf8( $domain, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46 ); // phpcs:ignore PHPCompatibility.FunctionUse.NewFunctionParameters.idn_to_utf8_variantFound, PHPCompatibility.Constants.NewConstants.intl_idna_variant_uts46Found
} elseif ( version_compare( PHP_VERSION, '7.2', '>=' ) && version_compare( PHP_VERSION, '7.4', '<' ) ) {
/*
* In PHP 7.2/7.3 calling idn_to_* functions with default arguments throws a warning.
* Thus we must set the variant explicitly. This may be reverted when PHP 7.4 is commonly used and
* idn_to_utf8 can be used in its default mode without warnings.
*/
$variant = INTL_IDNA_VARIANT_UTS46;
$options = IDNA_DEFAULT;
$domain = idn_to_utf8( $domain, $options, $variant );
} else {
$domain = idn_to_utf8( $domain );
}
Expand Down