From: Senthil Kumaran <senthil@uthcode.com>
Date: Mon, 14 Apr 2014 17:10:05 +0000 (-0400)
Subject: merge from 3.4
X-Git-Tag: v3.5.0a1~1889
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=166214c344202d269887ea06d219e6b121bd0927;p=thirdparty%2FPython%2Fcpython.git

merge from 3.4

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

166214c344202d269887ea06d219e6b121bd0927
diff --cc Lib/test/test_httplib.py
index 69aa38191838,22f7329886e3..1a6d8d04d3bb
--- a/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()