Visitar URL original
gh-66897: Upgrade HTTP CONNECT to protocol HTTP/1.1 by handlerbot · Pull Request #8305 · python/cpython · GitHub
Skip to content

gh-66897: Upgrade HTTP CONNECT to protocol HTTP/1.1 #8305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orsenthil merged 17 commits into from
Apr 5, 2023
+167 −21
Merged

gh-66897: Upgrade HTTP CONNECT to protocol HTTP/1.1 #8305

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9f5ce09
bpo-22708: Upgrade HTTP CONNECT to protocol HTTP/1.1 (GH-NNNN)
handlerbot Jul 16, 2018
c3927ed
Refactor tests to pass under -bb (fix ByteWarnings); missed some line…
handlerbot Jul 16, 2018
2fe3ade
Use consistent 'tunnelling' spelling in Lib/http/client.py
handlerbot Jul 20, 2018
b2f76d7
Lib/test/test_httplib: Remove remnant of obsoleted test.
handlerbot Jul 20, 2018
9990baa
Use dict.copy() not copy.copy()
handlerbot Jul 24, 2018
367b407
fix version changed
merwok Oct 7, 2022
f370042
Merge branch 'main' into fix-bpo-22708
handlerbot Oct 8, 2022
8b55642
Update Lib/http/client.py
handlerbot Oct 8, 2022
aa1508e
Switch to for/else: syntax, as suggested
handlerbot Oct 10, 2022
ef8b896
Don't use for: else:
handlerbot Oct 25, 2022
5d2f166
Merge branch 'main' into fix-bpo-22708
handlerbot Oct 25, 2022
87e514c
Sure, fine, w/e
handlerbot Oct 26, 2022
d224052
Oops
handlerbot Oct 26, 2022
70ba474
1nm to the left
handlerbot Oct 26, 2022
0a5db5f
Merge branch 'main' into fix-bpo-22708
handlerbot Oct 26, 2022
d3b5726
Merge branch 'main' into fix-bpo-22708
handlerbot Jan 12, 2023
92c4f20
Merge branch 'main' into fix-bpo-22708
arhadthedev Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor tests to pass under -bb (fix ByteWarnings); missed some line… 
…s >80.
  • Loading branch information
@handlerbot
handlerbot committed Jul 16, 2018
commit c3927ed9929afd67ec25794c68c076aed908d13b
41 changes: 22 additions & 19 deletions Lib/test/test_httplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,10 +1933,10 @@ def test_disallow_set_tunnel_after_connect(self):

def test_connect_with_tunnel(self):
d = {
'host': 'destination.com', b'host': b'destination.com',
b'host': b'destination.com',
b'port': client.HTTP_PORT,
}
self.conn.set_tunnel(d['host'])
self.conn.set_tunnel(d[b'host'].decode('ascii'))
self.conn.request('HEAD', '/', '')
self.assertEqual(self.conn.sock.host, self.host)
self.assertEqual(self.conn.sock.port, self.port)
Expand All @@ -1948,10 +1948,10 @@ def test_connect_with_tunnel(self):

def test_connect_with_tunnel_with_default_port(self):
d = {
'host': 'destination.com', b'host': b'destination.com',
'port': client.HTTP_PORT, b'port': client.HTTP_PORT,
b'host': b'destination.com',
b'port': client.HTTP_PORT,
}
self.conn.set_tunnel(d['host'], port=d['port'])
self.conn.set_tunnel(d[b'host'].decode('ascii'), port=d[b'port'])
self.conn.request('HEAD', '/', '')
self.assertEqual(self.conn.sock.host, self.host)
self.assertEqual(self.conn.sock.port, self.port)
Expand All @@ -1963,10 +1963,10 @@ def test_connect_with_tunnel_with_default_port(self):

def test_connect_with_tunnel_with_nonstandard_port(self):
d = {
'host': 'destination.com', b'host': b'destination.com',
'port': 8888, b'port': 8888,
b'host': b'destination.com',
b'port': 8888,
}
self.conn.set_tunnel(d['host'], port=d['port'])
self.conn.set_tunnel(d[b'host'].decode('ascii'), port=d[b'port'])
self.conn.request('HEAD', '/', '')
self.assertEqual(self.conn.sock.host, self.host)
self.assertEqual(self.conn.sock.port, self.port)
Expand All @@ -1981,13 +1981,13 @@ def test_connect_with_tunnel_with_nonstandard_port(self):
# case-insensitivity when injecting Host: headers if they're missing.
def test_connect_with_tunnel_with_different_host_header(self):
d = {
'host': 'destination.com', b'host': b'destination.com',
'tunnel_host_header': 'example.com:9876',
b'host': b'destination.com',
b'tunnel_host_header': b'example.com:9876',
b'port': client.HTTP_PORT,
}
self.conn.set_tunnel(
d['host'], headers={'HOST': d['tunnel_host_header']})
d[b'host'].decode('ascii'),
headers={'HOST': d[b'tunnel_host_header'].decode('ascii')})
self.conn.request('HEAD', '/', '')
self.assertEqual(self.conn.sock.host, self.host)
self.assertEqual(self.conn.sock.port, self.port)
Expand All @@ -1999,17 +1999,20 @@ def test_connect_with_tunnel_with_different_host_header(self):

def test_connect_with_tunnel_different_host(self):
d = {
'host': 'destination.com', b'host': b'destination.com',
'port': client.HTTP_PORT, b'port': client.HTTP_PORT,
b'host': b'destination.com',
b'port': client.HTTP_PORT,
}
self.conn.set_tunnel(d['host'])
self.conn.set_tunnel(d[b'host'].decode('ascii'))
self.conn.request('HEAD', '/', '')
self.assertEqual(self.conn.sock.host, self.host)
self.assertEqual(self.conn.sock.port, self.port)
self.assertIn(b'CONNECT %(host)s:%(port)d HTTP/1.1\r\nHost: %(host)s:%(port)d\r\n\r\n' % d, self.conn.sock.data)
self.assertIn(b'CONNECT %(host)s:%(port)d HTTP/1.1\r\n'
b'Host: %(host)s:%(port)d\r\n\r\n' % d,
self.conn.sock.data)
# issue22095
self.assertNotIn(b'Host: %(host)s:None' % d, self.conn.sock.data)
self.assertIn(b'HEAD / HTTP/1.1\r\nHost: %(host)s\r\n' % d, self.conn.sock.data)
self.assertIn(b'HEAD / HTTP/1.1\r\nHost: %(host)s\r\n' % d,
self.conn.sock.data)

def test_connect_with_tunnel_idna(self):
dest = '\u03b4\u03c0\u03b8.gr'
Expand All @@ -2024,10 +2027,10 @@ def test_connect_with_tunnel_idna(self):

def test_connect_put_request(self):
d = {
'host': 'destination.com', b'host': b'destination.com',
'port': client.HTTP_PORT, b'port': client.HTTP_PORT,
b'host': b'destination.com',
b'port': client.HTTP_PORT,
}
self.conn.set_tunnel(d['host'])
self.conn.set_tunnel(d[b'host'].decode('ascii'))
self.conn.request('PUT', '/', '')
self.assertEqual(self.conn.sock.host, self.host)
self.assertEqual(self.conn.sock.port, self.port)
Expand Down