Issue #22928: Disabled HTTP header injections in http.client.

Original patch by Demian Brecht.

diff --cc Lib/http/client.py
index 5e12a858d85f3672a5b5863d7e03cdc8560d296c,3f9e67bba482a63d8297919a3deb5414ed4d3b24..d2709ae1419f3a32ec5bdafc993b7fd4cb6e7018
--- 1/Lib/http/client.py
--- 2/Lib/http/client.py
+++ b/Lib/http/client.py
@@@ -68,9 -68,9 +68,10 @@@ Req-sent-unread-response       _CS_REQ_
  
  import email.parser
  import email.message
 +import http
  import io
  import os
+ import re
  import socket
  import collections
  from urllib.parse import urlsplit

diff --cc Lib/test/test_httplib.py
Simple merge

diff --cc Misc/NEWS
Simple merge