changeset: 88564:20a2597d6653 parent: 88560:967f368b7f75 parent: 88562:9c2d679bf279 user: Benjamin Peterson date: Sat Jan 18 21:51:11 2014 -0500 files: Lib/http/server.py Lib/test/test_httpservers.py Misc/ACKS Misc/NEWS description: merge 3.3 (#18574) diff -r 967f368b7f75 -r 20a2597d6653 Lib/http/server.py --- a/Lib/http/server.py Sun Jan 19 00:38:36 2014 +0200 +++ b/Lib/http/server.py Sat Jan 18 21:51:11 2014 -0500 @@ -355,7 +355,7 @@ """ self.send_response_only(100) - self.flush_headers() + self.end_headers() return True def handle_one_request(self): diff -r 967f368b7f75 -r 20a2597d6653 Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py Sun Jan 19 00:38:36 2014 +0200 +++ b/Lib/test/test_httpservers.py Sat Jan 18 21:51:11 2014 -0500 @@ -584,7 +584,8 @@ 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') 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_get_called() self.assertEqual(result[-1], b'Data\r\n') @@ -652,7 +653,8 @@ self.assertNotEqual(_readAndReseek(output), b'') result = _readAndReseek(output).split(b'\r\n') 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): usual_handler = self.handler # Save to avoid breaking any subsequent tests. diff -r 967f368b7f75 -r 20a2597d6653 Misc/ACKS --- a/Misc/ACKS Sun Jan 19 00:38:36 2014 +0200 +++ b/Misc/ACKS Sat Jan 18 21:51:11 2014 -0500 @@ -1052,6 +1052,7 @@ Brodie Rao Senko Rasic Antti Rasinen +Nikolaus Rath Sridhar Ratnakumar Ysj Ray Eric S. Raymond diff -r 967f368b7f75 -r 20a2597d6653 Misc/NEWS --- a/Misc/NEWS Sun Jan 19 00:38:36 2014 +0200 +++ b/Misc/NEWS Sat Jan 18 21:51:11 2014 -0500 @@ -25,6 +25,9 @@ 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 #20243: TarFile no longer raise ReadError when opened in write mode.