merge from 3.4

Issue #7776: Fix ``Host:'' header and reconnection when using  http.client.HTTPConnection.set_tunnel()
Patch by Nikolaus Rath.

diff --cc Lib/http/client.py
Simple merge

diff --cc Lib/test/test_httplib.py
index 69aa381918388a5b1c9bb189158bafdaa4a6dd9d,22f7329886e30867c683f416cfaddf4ae3e6cce9..1a6d8d04d3bbba616bcd41f13592e29a5cd07970
--- 1/Lib/test/test_httplib.py
--- 2/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@@ -56,11 -38,11 +58,14 @@@ class FakeSocket
      def makefile(self, mode, bufsize=None):
          if mode != 'r' and mode != 'rb':
              raise client.UnimplementedFileMode()
 -        return self.fileclass(self.text)
 +        # keep the file around so we can check how much was read from it
 +        self.file = self.fileclass(self.text)
 +        self.file.close = lambda:None #nerf close ()
 +        return self.file
  
+     def close(self):
+         pass
+ 
  class EPipeSocket(FakeSocket):
  
      def __init__(self, text, pipe_trigger):
@@@ -1207,8 -1019,7 +1253,8 @@@ class TunnelTests(TestCase)
  def test_main(verbose=None):
      support.run_unittest(HeaderTests, OfflineTest, BasicTest, TimeoutTest,
                           HTTPSTest, RequestBodyTest, SourceAddressTest,
 -                         HTTPResponseTest, TunnelTests)
 +                         HTTPResponseTest, ExtendedReadTest,
-                          ExtendedReadTestChunked)
++                         ExtendedReadTestChunked, TunnelTests)
  
  if __name__ == '__main__':
      test_main()

diff --cc Misc/NEWS
Simple merge