OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

dns: use url module instead of punycode for IDNA

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/35091
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
This commit is contained in:
Antoine du Hamel
2020-09-07 22:50:56 +02:00
parent 26eed3e0ed
commit d85e1f0703
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/api/intl.md
View File

@@ -51,6 +51,7 @@ option:
| `String.prototype.toLocale*Case()` | partial (not locale-aware) | full | full | full |
| [`Number.prototype.toLocaleString()`][] | partial (not locale-aware) | partial/full (depends on OS) | partial (English-only) | full |
| `Date.prototype.toLocale*String()` | partial (not locale-aware) | partial/full (depends on OS) | partial (English-only) | full |
| [Legacy URL Parser][] | partial (no IDN support) | full | full | full |
| [WHATWG URL Parser][] | partial (no IDN support) | full | full | full |
| [`require('buffer').transcode()`][] | none (function does not exist) | full | full | full |
| [REPL][] | partial (inaccurate line editing) | full | full | full |
@@ -193,6 +194,7 @@ to be helpful:
[ECMA-262]: https://tc39.github.io/ecma262/
[ECMA-402]: https://tc39.github.io/ecma402/
[ICU]: http://site.icu-project.org/
[Legacy URL parser]: url.md#url_legacy_url_api
[REPL]: repl.md#repl_repl
[Test262]: https://github.com/tc39/test262/tree/HEAD/test/intl402
[WHATWG URL parser]: url.md#url_the_whatwg_url_api

4
lib/internal/idna.js
View File

@@ -4,6 +4,6 @@ if (internalBinding('config').hasIntl) {
const { toASCII, toUnicode } = internalBinding('icu');
module.exports = { toASCII, toUnicode };
} else {
const { toASCII, toUnicode } = require('punycode');
module.exports = { toASCII, toUnicode };
const { domainToASCII, domainToUnicode } = require('internal/url');
module.exports = { toASCII: domainToASCII, toUnicode: domainToUnicode };
}

2
test/parallel/test-bootstrap-modules.js
View File

@@ -151,7 +151,7 @@ if (!common.isMainThread) {
if (common.hasIntl) {
expectedModules.add('Internal Binding icu');
} else {
expectedModules.add('NativeModule punycode');
expectedModules.add('NativeModule url');
}
if (process.features.inspector) {

5
test/parallel/test-url-format.js
View File

@@ -1,8 +1,11 @@
'use strict';
require('../common');
const common = require('../common');
const assert = require('assert');
const url = require('url');
if (!common.hasIntl)
common.skip('missing Intl');
// Formatting tests to verify that it'll format slightly wonky content to a
// valid URL.
const formatTests = {

6
test/parallel/test-url-parse-format.js
View File

@@ -1,5 +1,9 @@
'use strict';
require('../common');
const common = require('../common');
if (!common.hasIntl)
common.skip('missing Intl');
const assert = require('assert');
const inspect = require('util').inspect;