Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Fixes #193 : use INTL_IDNA_VARIANT_UTS46 constant only when exists #194

Merged
merged 1 commit into from
Aug 22, 2017
Merged

Fixes #193 : use INTL_IDNA_VARIANT_UTS46 constant only when exists #194

merged 1 commit into from
Aug 22, 2017

Conversation

samsonasik
Copy link
Contributor

Fixes #193

@samsonasik samsonasik mentioned this pull request Aug 19, 2017
Closed
geerteltink
geerteltink approved these changes Aug 19, 2017
View reviewed changes
Copy link
Member

@geerteltink geerteltink left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind my previous bad review. It's good what you did :)

weierophinney
weierophinney approved these changes Aug 22, 2017
View reviewed changes
Copy link
Member

@weierophinney weierophinney left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will revert the changes to the update_hostname_validator.php script on merge, but otherwise, this looks fine.

bin/update_hostname_validator.php
return idn_to_utf8($domain, 0, INTL_IDNA_VARIANT_UTS46);
};
}
return 'idn_to_utf8';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need to do the check here, as this script is only executed by maintainers and by Travis (which has an up-to-date libicu already).

@weierophinney weierophinney merged commit 6121d4f into zendframework:master Aug 22, 2017
weierophinney added a commit that referenced this pull request Aug 22, 2017
@weierophinney
Merge pull request #194 from samsonasik/fix-193
8800645 
Fixes #193 : use INTL_IDNA_VARIANT_UTS46 constant only when exists
weierophinney added a commit that referenced this pull request Aug 22, 2017
@weierophinney
Adds CHANGELOG for #194
15a9ac8
weierophinney added a commit that referenced this pull request Aug 22, 2017
@weierophinney
Merge branch 'hotfix/194'
010084d 
Close #194
Fixes #193
Fixes #192
weierophinney added a commit that referenced this pull request Aug 22, 2017
@weierophinney
Merge branch 'hotfix/194' into develop
0fb1d0e 
Forward port #194

Conflicts:
	CHANGELOG.md
@samsonasik samsonasik deleted the fix-193 branch August 22, 2017 14:59
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@geerteltink geerteltink geerteltink approved these changes

@weierophinney weierophinney weierophinney approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@samsonasik @weierophinney @geerteltink