merge 3.3 (#18574)

bd22d39b · Benjamin Peterson · c28ab088 · a96860c9 · bd22d39b
Commit bd22d39b authored Jan 18, 2014 by Benjamin Peterson
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Misc/NEWS Misc/NEWS +2 -2

No files found.
--- 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.