summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-01-19 02:51:11 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-01-19 02:51:11 (GMT)
commitc28ab08887ae1de3a759d77a227f4a2c8d9c918f (patch)
treec38b1d6ede22de9570abb92ce404bf209f9ebb97 /Misc
parent49776ef9e75065daf21c194c212cde73b378ff30 (diff)
parent3836593a2d9d8958325f3c312abb9207d47f87e6 (diff)
downloadcpython-c28ab08887ae1de3a759d77a227f4a2c8d9c918f.zip
cpython-c28ab08887ae1de3a759d77a227f4a2c8d9c918f.tar.gz
cpython-c28ab08887ae1de3a759d77a227f4a2c8d9c918f.tar.bz2
merge 3.3 (#18574)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index e2f990e..76cc888 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1052,6 +1052,7 @@ Jeff Ramnani
Brodie Rao
Senko Rasic
Antti Rasinen
+Nikolaus Rath
Sridhar Ratnakumar
Ysj Ray
Eric S. Raymond
diff --git a/Misc/NEWS b/Misc/NEWS
index 25eb033..3159881 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,6 +25,9 @@ Core and Builtins
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.