Skip to content
This repository was archived by the owner on Jan 13, 2021. It is now read-only.

Commit 8389e2e

Browse files
committed
Support the final drafts.
1 parent 8684d86 commit 8389e2e

File tree

6 files changed

+13
-17
lines changed

6 files changed

+13
-17
lines changed

README.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ and file down the rough edges.
3232
Versions
3333
========
3434

35-
``hyper`` provides support for drafts 14, 15, and 16 of the HTTP/2 draft
36-
specification and draft 9 of the HPACK draft specification. As further drafts
37-
are released, ``hyper`` will be updated to support them.
35+
``hyper`` supports the final draft of the HTTP/2 specification: additionally,
36+
it provides support for drafts 14, 15, and 16 of the HTTP/2 specification. It
37+
also supports the final draft of the HPACK specification.
3838

3939
Compatibility
4040
=============

docs/source/faq.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ an email. My email address can be found `on my GitHub profile page`_.
1212

1313
.. _on my GitHub profile page: https://github.com/Lukasa
1414

15-
What version of the HTTP/2 draft specification does ``hyper`` support?
16-
----------------------------------------------------------------------
15+
What version of the HTTP/2 specification does ``hyper`` support?
16+
----------------------------------------------------------------
1717

18-
Currently, ``hyper`` supports versions 14, 15, and 16 of the HTTP/2 draft
19-
specification, and version 9 of the HPACK draft specification. ``hyper`` will
20-
be updated to keep up with the HTTP/2 draft specifications as they progress.
18+
``hyper`` suports the final version of the HTTP/2 draft specification. It also
19+
supports versions 14, 15, and 16 of the specification. It supports the final
20+
version of the HPACK draft specification.
2121

2222
Does ``hyper`` support HTTP/2 flow control?
2323
-------------------------------------------

hyper/http20/hpack.py

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919

2020
log = logging.getLogger(__name__)
2121

22-
# The implementation draft of HPACK we support.
23-
DRAFT = 9
24-
2522

2623
def encode_integer(integer, prefix_bits):
2724
"""

hyper/http20/tls.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
from ..compat import ignore_missing, ssl
1111

1212

13-
NPN_PROTOCOL = 'h2-16'
14-
H2_NPN_PROTOCOLS = [NPN_PROTOCOL, 'h2-15', 'h2-14'] # All h2s we support.
13+
NPN_PROTOCOL = 'h2'
14+
H2_NPN_PROTOCOLS = [NPN_PROTOCOL, 'h2-16,' 'h2-15', 'h2-14'] # All h2s we support.
1515
SUPPORTED_NPN_PROTOCOLS = ['http/1.1'] + H2_NPN_PROTOCOLS
1616

1717

tasks.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from binascii import hexlify
55
from invoke import task
6-
from hyper.http20.hpack import Encoder, DRAFT
6+
from hyper.http20.hpack import Encoder
77

88
@task
99
def hpack():
@@ -36,7 +36,6 @@ def hpack():
3636

3737
# Prepare the output and the encoder.
3838
output = {
39-
'draft': DRAFT,
4039
'description': 'Encoded by hyper. See github.com/Lukasa/hyper for more information.',
4140
'cases': []
4241
}

test/test_hpack_integration.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ class TestHPACKDecoderIntegration(object):
1616
def test_can_decode_a_story(self, story):
1717
d = Decoder()
1818

19-
# We support draft 9 of the HPACK spec.
19+
# We test against draft 9 of the HPACK spec.
2020
if story['draft'] != 9:
21-
skip("We support draft 9, not draft %d" % story['draft'])
21+
skip("We test against draft 9, not draft %d" % story['draft'])
2222

2323
for case in story['cases']:
2424
try:

0 commit comments

Comments
 (0)