Skip to content

Commit d7027fb

Browse files
authored
Merge pull request #1660 from jdesrosiers/idn-format-updates
Change idn-* formats to use UTS #46 and move to registry
2 parents 651599f + 219350f commit d7027fb

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

specs/jsonschema-validation.md

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -437,12 +437,7 @@ These attributes apply to string instances.
437437
A string instance is valid against these format values if it is a valid Internet
438438
email address as follows:
439439

440-
- *email:* As defined by the "Mailbox" ABNF rule in [RFC 5321, section
441-
4.1.2](https://www.rfc-editor.org/info/rfc5321).
442-
- *idn-email:* As defined by the extended "Mailbox" ABNF rule in [RFC 6531,
443-
section 3.3](https://www.rfc-editor.org/info/rfc6531). Note that all strings
444-
valid against the "email" attribute are also valid against the "idn-email"
445-
attribute.
440+
- *email:* As defined by the "Mailbox" ABNF rule in [RFC 5321, section 4.1.2](https://www.rfc-editor.org/info/rfc5321).
446441

447442
#### Hostnames
448443

@@ -451,15 +446,7 @@ These attributes apply to string instances.
451446
A string instance is valid against these attributes if it is a valid
452447
representation for an Internet hostname as follows:
453448

454-
- *hostname:* As defined by
455-
[RFC 1123, section 2.1](https://www.rfc-editor.org/info/rfc1123), including
456-
host names produced using the Punycode algorithm specified in [RFC 5891,
457-
section 4.4](https://www.rfc-editor.org/info/rfc5891).
458-
- *idn-hostname:* As defined by either RFC 1123 as for hostname, or an
459-
internationalized hostname as defined by [RFC 5890, section
460-
2.3.2.3](https://www.rfc-editor.org/info/rfc5890). Note that all strings valid
461-
against the "hostname" attribute are also valid against the "idn-hostname"
462-
attribute.
449+
- *hostname:* As defined by [RFC 1123, section 2.1](https://www.rfc-editor.org/info/rfc1123).
463450

464451
#### IP Addresses
465452

specs/registries/format.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,18 +141,14 @@
141141
"supportedBy": []
142142
},
143143
"idn-email": {
144-
"description": "An email address as defined as Mailbox in RFC6531",
145-
"definingBody": "JSON Schema",
146-
"definition": "https://json-schema.org/draft/2020-12/json-schema-validation.html#name-email-addresses",
144+
"description": "An email address as defined by Mailbox in RFC6531 with the domain using the UTS #46 mapping for IDNs",
147145
"types": ["string"],
148146
"examples": ["user@exämple.com"],
149147
"deprecated": false,
150148
"supportedBy": []
151149
},
152150
"idn-hostname": {
153-
"description": "An internationalized host name as defined by RFC5890",
154-
"definingBody": "JSON Schema",
155-
"definition": "https://json-schema.org/draft/2020-12/json-schema-validation.html#name-hostnames",
151+
"description": "An internationalized host name as defined by IDNA2008 using the UTS #46 mapping",
156152
"types": ["string"],
157153
"examples": ["exämple.com"],
158154
"deprecated": false,
@@ -372,4 +368,4 @@
372368
"deprecated": false,
373369
"supportedBy": []
374370
}
375-
}
371+
}

0 commit comments

Comments
 (0)