diff options
| author | Stephen Toub <stoub@microsoft.com> | 2016-01-13 18:15:58 -0500 |
|---|---|---|
| committer | Stephen Toub <stoub@microsoft.com> | 2016-01-13 18:15:58 -0500 |
| commit | 761fa468d2fb09d00044fa1848b884b657191876 (patch) | |
| tree | 93612a19d048317c665705ce0db35227c4ce3d6c | |
| parent | 6e4da99f2a9325ad825ead28bcbfa814d04d360f (diff) | |
| parent | 6cb2ac46f482daec74fc136675ae4007437bc10d (diff) | |
| download | coreclr-761fa468d2fb09d00044fa1848b884b657191876.tar.gz coreclr-761fa468d2fb09d00044fa1848b884b657191876.tar.bz2 coreclr-761fa468d2fb09d00044fa1848b884b657191876.zip | |
Merge pull request #2641 from eerhardt/FixIdn
IdnMapping GetUnicode conformance tests fail
| -rw-r--r-- | src/corefx/System.Globalization.Native/idna.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corefx/System.Globalization.Native/idna.cpp b/src/corefx/System.Globalization.Native/idna.cpp index 024c02a6c8..6101296f42 100644 --- a/src/corefx/System.Globalization.Native/idna.cpp +++ b/src/corefx/System.Globalization.Native/idna.cpp @@ -12,7 +12,8 @@ const uint32_t UseStd3AsciiRules = 0x2; uint32_t GetOptions(uint32_t flags) { - uint32_t options = UIDNA_DEFAULT; + // Using Nontransitional to Unicode and Check ContextJ to match the current behavior of .NET on Windows + uint32_t options = UIDNA_NONTRANSITIONAL_TO_UNICODE | UIDNA_CHECK_CONTEXTJ; if ((flags & AllowUnassigned) == AllowUnassigned) { |