summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-01-19 03:32:05 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-01-19 03:32:05 (GMT)
commitbd22d39bae7f52f291ab9a374185ef4f8e5ff174 (patch)
tree8d918b46a10db64dd071e7d9f8c3b0c32dcff32d /Misc
parentc28ab08887ae1de3a759d77a227f4a2c8d9c918f (diff)
parenta96860c91cabb94675c25435e8d11443abb70db7 (diff)
downloadcpython-bd22d39bae7f52f291ab9a374185ef4f8e5ff174.zip
cpython-bd22d39bae7f52f291ab9a374185ef4f8e5ff174.tar.gz
cpython-bd22d39bae7f52f291ab9a374185ef4f8e5ff174.tar.bz2
merge 3.3 (#18574)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS4
1 files changed, 2 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 3159881..b97f4f8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,8 +25,8 @@ Core and Builtins
Library
-------
-- Issue #18574: Fixed handling of 100-continue reply from server in
- http.client.HTTPConnection. Patch by Nikolaus Rath.
+- Issue #18574: Added missing newline in 100-Continue reply from
+ http.server.BaseHTTPRequestHandler. Patch by Nikolaus Rath.
- Issue #20270: urllib.urlparse now supports empty ports.