Skip to content

Commit 3e076e6

Browse files
authored
refactor(application)!: dispatch HTTP to HTTPv1/HTTPv2 under the RFC names (#2524) (#2544)
1 parent 0b25f04 commit 3e076e6

73 files changed

Lines changed: 1782 additions & 463 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/source/contributing/conventions/protocol-family-grouping.rst‎

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ The member list takes either of these forms:
2121
:class:`~pcapkit.protocols.internet.esp.ESP` are not in it, since they belong to
2222
the separate abstract :class:`~pcapkit.protocols.internet.ipsec.IPsec`, whose
2323
:meth:`~pcapkit.protocols.internet.ipsec.IPsec.id` is ``('AH', 'ESP')``.
24+
:meth:`HTTP.id() <pcapkit.protocols.application.http.HTTP.id>` is
25+
``('HTTP/1', 'HTTP/2')``.
2426
* **The base's own name, then the members.**
2527
:meth:`VLAN.id() <pcapkit.protocols.link.vlan.VLAN.id>` is
26-
``('VLAN', 'C_Tag', 'S_Tag')``,
27-
:meth:`L2TP.id() <pcapkit.protocols.link.l2tp.L2TP.id>` is ``('L2TP', 'L2TPv2')``
28-
and :meth:`HTTP.id() <pcapkit.protocols.application.http.HTTP.id>` is
29-
``('HTTP', 'HTTPv1', 'HTTPv2')``.
28+
``('VLAN', 'C_Tag', 'S_Tag')`` and
29+
:meth:`L2TP.id() <pcapkit.protocols.link.l2tp.L2TP.id>` is ``('L2TP', 'L2TPv2')``.
3030

3131
:meth:`ARP.id() <pcapkit.protocols.link.arp.ARP.id>` is ``('ARP',)`` alone; see
3232
:ref:`protocol-family-shapes`.
@@ -48,7 +48,29 @@ HTTP/2 share :class:`~pcapkit.protocols.application.http.HTTP`, IPv4 and IPv6 sh
4848

4949
:class:`~pcapkit.protocols.internet.ip.IP` and
5050
:class:`~pcapkit.protocols.internet.ipsec.IPsec` define no ``read()``. The HTTP class
51-
does, and a parsed HTTP/1.1 or HTTP/2 layer is the HTTP class itself.
51+
does, but yields no instance of itself (:ref:`below <protocol-family-dispatch>`).
52+
53+
.. _protocol-family-dispatch:
54+
55+
Dispatching Bases
56+
~~~~~~~~~~~~~~~~~
57+
58+
**A versioned family's base dispatches on both paths** (:issue:`2524`). Parsing
59+
octets through it, constructing it from fields and its ``from_data`` give the member
60+
the octets, fields or data model describe, never an instance of the base. In
61+
:class:`~pcapkit.protocols.application.http.HTTP`,
62+
:meth:`~pcapkit.protocols.application.http.HTTP._dispatch_version` picks the member
63+
from the octets, for a payload a transport port binds to HTTP as well, and
64+
:meth:`~pcapkit.protocols.application.http.HTTP._dispatch_fields` from the fields.
65+
The other versioned families are tracked on :issue:`2574`.
66+
67+
**Octets neither version takes**, a frameless HTTP/2 connection preface among them,
68+
are :class:`~pcapkit.protocols.misc.raw.Raw` with no ``error`` on the transport path,
69+
and a direct ``HTTP(...)`` on them raises
70+
:exc:`~pcapkit.utilities.exceptions.ProtocolError` (:issue:`2524`). Octets the
71+
dispatcher gives :class:`~pcapkit.protocols.application.httpv2.HTTPv2` that its parser
72+
then refuses, such as a preface and three octets, are
73+
:class:`~pcapkit.protocols.misc.raw.Raw` with the parser's ``error``.
5274

5375
.. _protocol-family-shapes:
5476

@@ -70,15 +92,14 @@ Member Shapes
7092
:class:`IGMPv3 <pcapkit.protocols.internet.igmpv3.IGMPv3>` ``('IGMPv3',)`` --
7193
:class:`IGMPv1 <pcapkit.protocols.internet.igmpv1.IGMPv1>` narrows the same way,
7294
but to the RFC canonical name rather than a versioned one
73-
(:ref:`protocol-family-canonical-names`)
95+
(:ref:`protocol-family-canonical-names`);
96+
:class:`HTTPv1 <pcapkit.protocols.application.httpv1.HTTPv1>` ``('HTTP/1',)``
97+
and :class:`HTTPv2 <pcapkit.protocols.application.httpv2.HTTPv2>`
98+
``('HTTP/2',)``
7499
* - Family-inclusive
75100
- the member's label plus the family name
76101
- :class:`~pcapkit.protocols.link.c_tag.C_Tag` ``('C_Tag', 'VLAN')``,
77102
:class:`~pcapkit.protocols.link.s_tag.S_Tag` ``('S_Tag', 'VLAN')``;
78-
:class:`HTTPv1 <pcapkit.protocols.application.httpv1.HTTP>`
79-
``('HTTP', 'HTTPv1')`` and
80-
:class:`HTTPv2 <pcapkit.protocols.application.httpv2.HTTP>`
81-
``('HTTP', 'HTTPv2')``;
82103
:class:`~pcapkit.protocols.link.l2tpv2.L2TPv2` ``('L2TP', 'L2TPv2')``
83104
* - One parser, dynamic alias
84105
- fixed, whichever protocol was read
@@ -99,7 +120,7 @@ A family-inclusive member is selected by any sibling's registry key (a key of
99120
``pcapkit.protocols.__proto__``), because each expands to the shared family name
100121
(:ref:`below <protocol-family-selectors>`). A narrow member is selected by its own name
101122
and by the key of each family whose ``id()`` lists it: ``AH`` and ``ESP`` by ``IPsec``
102-
and by ``IPv6_Ext``.
123+
and by ``IPv6_Ext``, ``HTTPv1`` and ``HTTPv2`` by ``HTTP``.
103124

104125
Chained Records
105126
~~~~~~~~~~~~~~~
@@ -142,6 +163,16 @@ them with one. The family base's ``id()`` follows:
142163
canonical name and the family's own name are the same string -- the same shape
143164
:meth:`ICMP.id() <pcapkit.protocols.internet.icmp.ICMP.id>` takes, ``('ICMP', 'ICMPv6')``.
144165

166+
**HTTP takes the RFC names as well** (:issue:`2524`). :rfc:`9113` names its protocol
167+
``HTTP/2``, so :meth:`HTTPv2.id() <pcapkit.protocols.application.httpv2.HTTPv2.id>` is
168+
``('HTTP/2',)``. :rfc:`9112` names ``HTTP/1.1``, but the HTTP/1 class also reads
169+
messages declaring 1.0 or 0.9, so
170+
:meth:`HTTPv1.id() <pcapkit.protocols.application.httpv1.HTTPv1.id>` is the major
171+
version, ``('HTTP/1',)``, and ``alias`` carries the exact one. No member's name
172+
is the family's, so :meth:`HTTP.id() <pcapkit.protocols.application.http.HTTP.id>`
173+
lists the members alone, ``('HTTP/1', 'HTTP/2')``, the shape of
174+
:meth:`IP.id() <pcapkit.protocols.internet.ip.IP.id>`.
175+
145176
.. _protocol-family-selectors:
146177

147178
Selector Matching
@@ -151,6 +182,10 @@ Selector Matching
151182
:pr:`2443`. On an IPv4 frame, ``'IP' in`` is ``True`` and ``'IPv6' in`` is ``False``.
152183
On an IPv6 frame, ``'IP' in`` is ``True`` and ``'IPv4' in`` is ``False``.
153184

185+
HTTP follows it too (:issue:`2524`). On an HTTP/1.1 frame, ``'HTTP' in`` and
186+
``'HTTP/1' in`` are ``True`` and ``'HTTP/2' in`` is ``False``, since the layer is
187+
:class:`~pcapkit.protocols.application.httpv1.HTTPv1`; an HTTP/2 frame is the reverse.
188+
154189
What a selector on a frame or a layer reaches is defined by
155190
:meth:`~pcapkit.protocols.protocol.Protocol.expand_comp`,
156191
:meth:`~pcapkit.protocols.protocol.Protocol.__contains__`,
@@ -161,7 +196,9 @@ Selectors are case-insensitive: ``'ipv4' in`` an IPv4 frame is ``True``.
161196
is not expanded. On a parsed IPv4 layer, ``ipv4 == 'IPv4'`` is ``True`` and
162197
``ipv4 == 'IP'`` is ``False``. On a parsed C-Tag layer, ``== 'VLAN'`` is ``True``,
163198
since ``VLAN`` is in its ``id()``, and ``== 'S_Tag'`` is ``False``, though
164-
``'S_Tag' in`` the layer is ``True``.
199+
``'S_Tag' in`` the layer is ``True``. On a parsed HTTP/1.1 layer, ``== 'HTTP/1'`` is
200+
``True`` and ``== 'HTTP'`` is ``False``, since no member's ``id()`` carries
201+
``HTTP``, though ``'HTTP' in`` the layer is ``True``.
165202
* ``in`` **and** ``[]`` expand the selector first. A registry key becomes its class
166203
plus that class's ``id()``, as does a class object, and a layer matches when any of
167204
those appears among its own class and ``id()``. So ``'S_Tag' in`` a C-Tag frame is
@@ -204,8 +241,6 @@ holds :class:`~pcapkit.protocols.link.linux_sll1.LinuxSLL1`. **The** ``schema/``
204241
name, and sub-structure classes such as
205242
:class:`~pcapkit.protocols.schema.internet.igmpv3.Query` share its module. Ruled on
206243
:issue:`2529`, where the classes that do not match yet are pending:
207-
:class:`httpv1.HTTP <pcapkit.protocols.application.httpv1.HTTP>`,
208-
:class:`httpv2.HTTP <pcapkit.protocols.application.httpv2.HTTP>`,
209244
:class:`arp.InARP <pcapkit.protocols.link.arp.InARP>`,
210245
:class:`tls.SSLv3 <pcapkit.protocols.application.tls.SSLv3>` and
211246
:class:`null.NoPayload <pcapkit.protocols.misc.null.NoPayload>`.

‎docs/source/contributing/conventions/protocol-member-order.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The Order
4141
:issue:`2490`.
4242
d. **Other helpers.** Every helper that ``read()``, ``make()`` and the registries
4343
do not reach goes last, including one that only another helper calls, such as
44-
``_decode_text()`` in :class:`~pcapkit.protocols.application.httpv1.HTTP`.
44+
``_decode_text()`` in :class:`~pcapkit.protocols.application.httpv1.HTTPv1`.
4545
Ruled on :issue:`2490`.
4646

4747
**Registry maps.** The registry maps themselves (``__proto__``, ``__option__``,

‎docs/source/contributing/pep.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ Follow-ups to the bindings above:
361361
<pcapkit.protocols.transport.tcp.TCP.__proto__>` and :attr:`UDP.__proto__
362362
<pcapkit.protocols.transport.udp.UDP.__proto__>` both point their HTTP ports at
363363
the version-identifying proxy :class:`pcapkit.protocols.application.http.HTTP`
364-
rather than at :class:`pcapkit.protocols.application.httpv1.HTTP`, so a
364+
rather than at :class:`pcapkit.protocols.application.httpv1.HTTPv1`, so a
365365
segment's HTTP version is decided by its payload rather than asserted by its
366366
port number. That depends on the proxy identifying the version positively
367367
instead of guessing, since a guess path is wrong on non-HTTP input.

‎docs/source/ext.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ The protocol classes :mod:`pcapkit` ships:
9898
+ Application Layer +----------------+-----------------------+-------------------------------------------------------------+
9999
| (:class:`~pcapkit.protocols.application.application.Application` | | :class:`pcapkit.protocols.application.http.HTTP` |
100100
+ subclasses) + +-----------------------+-------------------------------------------------------------+
101-
| | HTTP Family | :class:`pcapkit.protocols.application.httpv1.HTTP` |
101+
| | HTTP Family | :class:`pcapkit.protocols.application.httpv1.HTTPv1` |
102102
+ + +-----------------------+-------------------------------------------------------------+
103-
| | | :class:`pcapkit.protocols.application.httpv2.HTTP` |
103+
| | | :class:`pcapkit.protocols.application.httpv2.HTTPv2` |
104104
+ +----------------+-----------------------+-------------------------------------------------------------+
105105
| | :class:`pcapkit.protocols.application.ngap.NGAP` |
106106
+ +----------------+-----------------------+-------------------------------------------------------------+
@@ -406,7 +406,7 @@ writes them:
406406
+ + +-----------------------------------------------------------------------------------------------+----------------------------------------------------------------------------+
407407
| | | :attr:`SCTP.__cause__ <pcapkit.protocols.transport.sctp.SCTP.__cause__>` | :func:`~pcapkit.foundation.registry.protocols.register_sctp_cause` |
408408
+-------------------+------------------------------------------------------------+-----------------------------------------------------------------------------------------------+----------------------------------------------------------------------------+
409-
| Application Layer | :class:`~pcapkit.protocols.application.httpv2.HTTP` | :attr:`HTTP.__frame__ <pcapkit.protocols.application.httpv2.HTTP.__frame__>` | :func:`~pcapkit.foundation.registry.protocols.register_http_frame` |
409+
| Application Layer | :class:`~pcapkit.protocols.application.httpv2.HTTPv2` | :attr:`HTTPv2.__frame__ <pcapkit.protocols.application.httpv2.HTTPv2.__frame__>` | :func:`~pcapkit.foundation.registry.protocols.register_http_frame` |
410410
+-------------------+------------------------------------------------------------+-----------------------------------------------------------------------------------------------+----------------------------------------------------------------------------+
411411
| | | :attr:`PCAPNG.__block__ <pcapkit.protocols.misc.pcapng.PCAPNG.__block__>` | :func:`~pcapkit.foundation.registry.protocols.register_pcapng_block` |
412412
+ + +-----------------------------------------------------------------------------------------------+----------------------------------------------------------------------------+

‎docs/source/pcapkit/protocols/application/application.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Application Layer Base Protocol
66
:mod:`pcapkit.protocols.application.application` contains only
77
:class:`~pcapkit.protocols.application.application.Application`,
88
which is a base class for application layer protocols, e.g.
9-
:class:`HTTP/1.* <pcapkit.protocols.application.httpv1.HTTP>` and
10-
:class:`HTTP/2 <pcapkit.protocols.application.httpv2.HTTP>`.
9+
:class:`HTTP/1.* <pcapkit.protocols.application.httpv1.HTTPv1>` and
10+
:class:`HTTP/2 <pcapkit.protocols.application.httpv2.HTTPv2>`.
1111

1212
.. versionchanged:: 1.5.0
1313

‎docs/source/pcapkit/protocols/application/http.rst‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,21 @@ HTTP - Hypertext Transfer Protocol
77
:class:`~pcapkit.protocols.application.http.HTTP`,
88
which is a base class for Hypertext Transfer
99
Protocol (HTTP) [*]_ family, e.g.
10-
:class:`HTTP/1.* <pcapkit.protocols.application.httpv1.HTTP>`
11-
and :class:`HTTP/2 <pcapkit.protocols.application.httpv2.HTTP>`,
10+
:class:`HTTP/1.* <pcapkit.protocols.application.httpv1.HTTPv1>`
11+
and :class:`HTTP/2 <pcapkit.protocols.application.httpv2.HTTPv2>`,
1212
and :func:`~pcapkit.protocols.application.http.test_start_line`,
1313
which tells whether a payload opens with an HTTP/1.* start line.
1414

15+
.. versionchanged:: 1.6.0
16+
17+
A payload a transport port binds to
18+
:class:`~pcapkit.protocols.application.http.HTTP`, and constructing or
19+
rebuilding that class, give
20+
:class:`~pcapkit.protocols.application.httpv1.HTTPv1` or
21+
:class:`~pcapkit.protocols.application.httpv2.HTTPv2` rather than an instance
22+
of it, so the data sits under ``httpv1`` or ``httpv2`` rather than ``http``
23+
(:issue:`2524`).
24+
1525
.. autoclass:: pcapkit.protocols.application.http.HTTP
1626
:no-members:
1727
:show-inheritance:
@@ -28,7 +38,12 @@ which tells whether a payload opens with an HTTP/1.* start line.
2838

2939
.. automethod:: _make_data
3040

41+
.. automethod:: __new__
42+
3143
.. automethod:: _guess_version
44+
.. automethod:: _dispatch_version
45+
.. automethod:: _dispatch_fields
46+
.. automethod:: _member_of_version
3247

3348
.. autoattribute:: _preface_length
3449

‎docs/source/pcapkit/protocols/application/httpv1.rst‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HTTP/1.* - Hypertext Transfer Protocol
44
.. module:: pcapkit.protocols.application.httpv1
55

66
:mod:`pcapkit.protocols.application.httpv1` contains
7-
:class:`~pcapkit.protocols.application.httpv1.HTTP`,
7+
:class:`~pcapkit.protocols.application.httpv1.HTTPv1`,
88
which implements an extractor for Hypertext Transfer
99
Protocol (HTTP/1.*) [*]_, and its
1010
:class:`~pcapkit.protocols.application.httpv1.Type` enumeration. The
@@ -31,7 +31,13 @@ structure of an HTTP/1.* message is described as below:
3131
rather than normalised or re-encoded (:issue:`1241`, :issue:`1302`,
3232
:issue:`1333`).
3333

34-
.. autoclass:: pcapkit.protocols.application.httpv1.HTTP
34+
.. versionremoved:: 1.6.0
35+
36+
``pcapkit.protocols.application.httpv1.HTTP``, with no alias. The
37+
class is renamed :class:`~pcapkit.protocols.application.httpv1.HTTPv1`,
38+
after its module (:issue:`2529`).
39+
40+
.. autoclass:: pcapkit.protocols.application.httpv1.HTTPv1
3541
:no-members:
3642
:show-inheritance:
3743

@@ -60,7 +66,13 @@ Header Schemas
6066

6167
.. module:: pcapkit.protocols.schema.application.httpv1
6268

63-
.. autoclass:: pcapkit.protocols.schema.application.httpv1.HTTP
69+
.. versionremoved:: 1.6.0
70+
71+
``pcapkit.protocols.schema.application.httpv1.HTTP``, with no alias. The
72+
class is renamed :class:`~pcapkit.protocols.schema.application.httpv1.HTTPv1`,
73+
after its module (:issue:`2529`).
74+
75+
.. autoclass:: pcapkit.protocols.schema.application.httpv1.HTTPv1
6476
:members:
6577
:show-inheritance:
6678

@@ -69,7 +81,13 @@ Data Models
6981

7082
.. module:: pcapkit.protocols.data.application.httpv1
7183

72-
.. autoclass:: pcapkit.protocols.data.application.httpv1.HTTP
84+
.. versionremoved:: 1.6.0
85+
86+
``pcapkit.protocols.data.application.httpv1.HTTP``, with no alias. The
87+
class is renamed :class:`~pcapkit.protocols.data.application.httpv1.HTTPv1`,
88+
after its module (:issue:`2529`).
89+
90+
.. autoclass:: pcapkit.protocols.data.application.httpv1.HTTPv1
7391
:members:
7492
:show-inheritance:
7593

‎docs/source/pcapkit/protocols/application/httpv2.rst‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HTTP/2 - Hypertext Transfer Protocol
44
.. module:: pcapkit.protocols.application.httpv2
55

66
:mod:`pcapkit.protocols.application.httpv2` contains
7-
:class:`~pcapkit.protocols.application.httpv2.HTTP`
7+
:class:`~pcapkit.protocols.application.httpv2.HTTPv2`
88
only, which implements an extractor for Hypertext Transfer
99
Protocol (HTTP/2) [*]_, whose structure is described as
1010
below:
@@ -31,11 +31,17 @@ Octets Bits Name Description
3131
are kept (:issue:`652`, :issue:`668`, :issue:`1244`, :issue:`1245`,
3232
:issue:`1246`, :issue:`1247`).
3333

34+
.. versionremoved:: 1.6.0
35+
36+
``pcapkit.protocols.application.httpv2.HTTP``, with no alias. The
37+
class is renamed :class:`~pcapkit.protocols.application.httpv2.HTTPv2`,
38+
after its module (:issue:`2529`).
39+
3440
.. raw:: html
3541

3642
<br />
3743

38-
.. autoclass:: pcapkit.protocols.application.httpv2.HTTP
44+
.. autoclass:: pcapkit.protocols.application.httpv2.HTTPv2
3945
:no-members:
4046
:show-inheritance:
4147

@@ -85,7 +91,13 @@ Header Schemas
8591

8692
.. module:: pcapkit.protocols.schema.application.httpv2
8793

88-
.. autoclass:: pcapkit.protocols.schema.application.httpv2.HTTP
94+
.. versionremoved:: 1.6.0
95+
96+
``pcapkit.protocols.schema.application.httpv2.HTTP``, with no alias. The
97+
class is renamed :class:`~pcapkit.protocols.schema.application.httpv2.HTTPv2`,
98+
after its module (:issue:`2529`).
99+
100+
.. autoclass:: pcapkit.protocols.schema.application.httpv2.HTTPv2
89101
:members:
90102
:show-inheritance:
91103

@@ -170,7 +182,13 @@ Data Models
170182

171183
.. module:: pcapkit.protocols.data.application.httpv2
172184

173-
.. autoclass:: pcapkit.protocols.data.application.httpv2.HTTP
185+
.. versionremoved:: 1.6.0
186+
187+
``pcapkit.protocols.data.application.httpv2.HTTP``, with no alias. The
188+
class is renamed :class:`~pcapkit.protocols.data.application.httpv2.HTTPv2`,
189+
after its module (:issue:`2529`).
190+
191+
.. autoclass:: pcapkit.protocols.data.application.httpv2.HTTPv2
174192
:members:
175193
:show-inheritance:
176194

‎docs/source/pcapkit/protocols/index.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ from given information. The class hierarchy of :mod:`pcapkit.protocols`:
174174

175175
click Application "application/application.html#pcapkit.protocols.application.application.Application"
176176
click HTTP "application/http.html#pcapkit.protocols.application.http.HTTP"
177-
click h1 "application/httpv1.html#pcapkit.protocols.application.httpv1.HTTP"
178-
click h2 "application/httpv2.html#pcapkit.protocols.application.httpv2.HTTP"
177+
click h1 "application/httpv1.html#pcapkit.protocols.application.httpv1.HTTPv1"
178+
click h2 "application/httpv2.html#pcapkit.protocols.application.httpv2.HTTPv2"
179179
click FTP "application/ftp.html#pcapkit.protocols.application.ftp.FTP"
180180
click FTP_DATA "application/ftp_data.html#pcapkit.protocols.application.ftp_data.FTP_DATA"
181181
click NGAP "application/ngap.html#pcapkit.protocols.application.ngap.NGAP"

‎docs/source/pcapkit/protocols/link/l2tp.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ the value 1 "to permit detection of L2F packets should they arrive intermixed wi
5353
L2TP packets". L2F is a separate protocol with its own header, so it is to be
5454
implemented as ``L2F``, the canonical name, with ``L2TPv1`` only as an alias in its
5555
:meth:`~pcapkit.protocols.protocol.Protocol.id`. See
56-
:meth:`HTTPv1.id <pcapkit.protocols.application.httpv1.HTTP.id>` for
56+
:meth:`L2TPv2.id <pcapkit.protocols.link.l2tpv2.L2TPv2.id>` for
5757
how a version-flavoured alias is spelled: canonical name first, alias second,
5858
since callers take element zero as canonical.
5959

0 commit comments

Comments
 (0)