Skip to content

C
cpython
Commit c28ab088 authored by Benjamin Peterson's avatar Benjamin Peterson
Browse files
Options

merge 3.3 (#18574)

parents 49776ef9 3836593a
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
Lib/http/server.py
View file @ c28ab088
...@@ -355,7 +355,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): ...@@ -355,7 +355,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
""" """
self.send_response_only(100) self.send_response_only(100)
self.flush_headers() self.end_headers()
return True return True
def handle_one_request(self): def handle_one_request(self):
......
Lib/test/test_httpservers.py
View file @ c28ab088
...@@ -584,7 +584,8 @@ class BaseHTTPRequestHandlerTestCase(unittest.TestCase): ...@@ -584,7 +584,8 @@ class BaseHTTPRequestHandlerTestCase(unittest.TestCase):
def test_with_continue_1_1(self): def test_with_continue_1_1(self):
result = self.send_typical_request(b'GET / HTTP/1.1\r\nExpect: 100-continue\r\n\r\n') result = self.send_typical_request(b'GET / HTTP/1.1\r\nExpect: 100-continue\r\n\r\n')
self.assertEqual(result[0], b'HTTP/1.1 100 Continue\r\n') self.assertEqual(result[0], b'HTTP/1.1 100 Continue\r\n')
self.assertEqual(result[1], b'HTTP/1.1 200 OK\r\n') self.assertEqual(result[1], b'\r\n')
self.assertEqual(result[2], b'HTTP/1.1 200 OK\r\n')
self.verify_expected_headers(result[2:-1]) self.verify_expected_headers(result[2:-1])
self.verify_get_called() self.verify_get_called()
self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n')
...@@ -652,7 +653,8 @@ class BaseHTTPRequestHandlerTestCase(unittest.TestCase): ...@@ -652,7 +653,8 @@ class BaseHTTPRequestHandlerTestCase(unittest.TestCase):
self.assertNotEqual(_readAndReseek(output), b'') self.assertNotEqual(_readAndReseek(output), b'')
result = _readAndReseek(output).split(b'\r\n') result = _readAndReseek(output).split(b'\r\n')
self.assertEqual(result[0], b'HTTP/1.1 100 Continue') self.assertEqual(result[0], b'HTTP/1.1 100 Continue')
self.assertEqual(result[1], b'HTTP/1.1 200 OK') self.assertEqual(result[1], b'')
self.assertEqual(result[2], b'HTTP/1.1 200 OK')
def test_with_continue_rejected(self): def test_with_continue_rejected(self):
usual_handler = self.handler # Save to avoid breaking any subsequent tests. usual_handler = self.handler # Save to avoid breaking any subsequent tests.
......
Misc/ACKS
View file @ c28ab088
...@@ -1052,6 +1052,7 @@ Jeff Ramnani ...@@ -1052,6 +1052,7 @@ Jeff Ramnani
Brodie Rao Brodie Rao
Senko Rasic Senko Rasic
Antti Rasinen Antti Rasinen
Nikolaus Rath
Sridhar Ratnakumar Sridhar Ratnakumar
Ysj Ray Ysj Ray
Eric S. Raymond Eric S. Raymond
......
Misc/NEWS
View file @ c28ab088
...@@ -25,6 +25,9 @@ Core and Builtins ...@@ -25,6 +25,9 @@ Core and Builtins
Library Library
------- -------
- Issue #18574: Fixed handling of 100-continue reply from server in
http.client.HTTPConnection. Patch by Nikolaus Rath.
- Issue #20270: urllib.urlparse now supports empty ports. - Issue #20270: urllib.urlparse now supports empty ports.
- Issue #20243: TarFile no longer raise ReadError when opened in write mode. - Issue #20243: TarFile no longer raise ReadError when opened in write mode.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7