Merge pull request #220 from vfaronov/development

Use the right alphabet for HTTP2-Settings (fixes #219)

Author: Lukasa

hyper/http11/connection.py

@@ -264,7 +264,8 @@ def _add_upgrade_headers(self, headers):
         # Encode SETTINGS frame payload in Base64 and put into the HTTP-2 Settings header.
         http2_settings = SettingsFrame(0)
         http2_settings.settings[SettingsFrame.INITIAL_WINDOW_SIZE] = 65535
-        headers[b'HTTP2-Settings'] = base64.b64encode(http2_settings.serialize_body())
+        encoded_settings = base64.urlsafe_b64encode(http2_settings.serialize_body())
+        headers[b'HTTP2-Settings'] = encoded_settings.rstrip(b'=')
 
     def _send_body(self, body, body_type):
         """

test/test_http11.py

@@ -116,7 +116,7 @@ def test_basic_request(self):
             b"User-Agent: hyper\r\n"
             b"connection: Upgrade, HTTP2-Settings\r\n"
             b"upgrade: h2c\r\n"
-            b"HTTP2-Settings: AAQAAP//\r\n"
+            b"HTTP2-Settings: AAQAAP__\r\n"
             b"host: httpbin.org\r\n"
             b"\r\n"
         )
@@ -143,7 +143,7 @@ def test_iterable_header(self):
             b"Custom-field: test2\r\n"
             b"connection: Upgrade, HTTP2-Settings\r\n"
             b"upgrade: h2c\r\n"
-            b"HTTP2-Settings: AAQAAP//\r\n"
+            b"HTTP2-Settings: AAQAAP__\r\n"
             b"host: httpbin.org\r\n"
             b"\r\n"
         )
@@ -169,7 +169,7 @@ def test_proxy_request(self):
             b"User-Agent: hyper\r\n"
             b"connection: Upgrade, HTTP2-Settings\r\n"
             b"upgrade: h2c\r\n"
-            b"HTTP2-Settings: AAQAAP//\r\n"
+            b"HTTP2-Settings: AAQAAP__\r\n"
             b"host: httpbin.org\r\n"
             b"\r\n"
         )
@@ -193,7 +193,7 @@ def test_request_with_bytestring_body(self):
             b"User-Agent: hyper\r\n"
             b"connection: Upgrade, HTTP2-Settings\r\n"
             b"upgrade: h2c\r\n"
-            b"HTTP2-Settings: AAQAAP//\r\n"
+            b"HTTP2-Settings: AAQAAP__\r\n"
             b"content-length: 2\r\n"
             b"host: httpbin.org\r\n"
             b"\r\n"
@@ -225,7 +225,7 @@ def fake_fstat(*args):
                 b"POST /post HTTP/1.1\r\n"
                 b"connection: Upgrade, HTTP2-Settings\r\n"
                 b"upgrade: h2c\r\n"
-                b"HTTP2-Settings: AAQAAP//\r\n"
+                b"HTTP2-Settings: AAQAAP__\r\n"
                 b"content-length: 16\r\n"
                 b"host: httpbin.org\r\n"
                 b"\r\n"
@@ -253,7 +253,7 @@ def body():
             b"POST /post HTTP/1.1\r\n"
             b"connection: Upgrade, HTTP2-Settings\r\n"
             b"upgrade: h2c\r\n"
-            b"HTTP2-Settings: AAQAAP//\r\n"
+            b"HTTP2-Settings: AAQAAP__\r\n"
             b"transfer-encoding: chunked\r\n"
             b"host: httpbin.org\r\n"
             b"\r\n"
@@ -283,7 +283,7 @@ def body():
             b"content-length: 10\r\n"
             b"connection: Upgrade, HTTP2-Settings\r\n"
             b"upgrade: h2c\r\n"
-            b"HTTP2-Settings: AAQAAP//\r\n"
+            b"HTTP2-Settings: AAQAAP__\r\n"
             b"host: httpbin.org\r\n"
             b"\r\n"
             b"hitheresir"
@@ -310,7 +310,7 @@ def test_chunked_overrides_body(self):
             b"transfer-encoding: chunked\r\n"
             b"connection: Upgrade, HTTP2-Settings\r\n"
             b"upgrade: h2c\r\n"
-            b"HTTP2-Settings: AAQAAP//\r\n"
+            b"HTTP2-Settings: AAQAAP__\r\n"
             b"host: httpbin.org\r\n"
             b"\r\n"
             b"8\r\noneline\n\r\n"